Merge "Don't crash on rotation when cropping a profile picture" into klp-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 653290d..eced663 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -854,6 +854,18 @@
                 android:resource="@id/security_settings" />
         </activity>
 
+        <activity android:name="MonitoringCertInfoActivity"
+                android:label="@string/ssl_ca_cert_dialog_title"
+                android:theme="@style/Transparent"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.MONITORING_CERT_INFO" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$TrustedCredentialsSettingsActivity"
                 android:label="@string/trusted_credentials"
                 android:taskAffinity=""
diff --git a/res/drawable-hdpi/ic_qs_certificate_info.png b/res/drawable-hdpi/ic_qs_certificate_info.png
new file mode 100644
index 0000000..1fdaaf9
--- /dev/null
+++ b/res/drawable-hdpi/ic_qs_certificate_info.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_home.png b/res/drawable-hdpi/ic_settings_home.png
new file mode 100644
index 0000000..42354cd
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment.png b/res/drawable-hdpi/ic_settings_nfc_payment.png
new file mode 100644
index 0000000..7b63e53
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_nfc_payment.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_qs_certificate_info.png b/res/drawable-mdpi/ic_qs_certificate_info.png
new file mode 100644
index 0000000..3b49472
--- /dev/null
+++ b/res/drawable-mdpi/ic_qs_certificate_info.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_home.png b/res/drawable-mdpi/ic_settings_home.png
new file mode 100644
index 0000000..8064773
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment.png b/res/drawable-mdpi/ic_settings_nfc_payment.png
new file mode 100644
index 0000000..c3101bc
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_nfc_payment.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_qs_certificate_info.png b/res/drawable-xhdpi/ic_qs_certificate_info.png
new file mode 100644
index 0000000..b3de2ce
--- /dev/null
+++ b/res/drawable-xhdpi/ic_qs_certificate_info.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_home.png b/res/drawable-xhdpi/ic_settings_home.png
new file mode 100644
index 0000000..687025d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment.png b/res/drawable-xhdpi/ic_settings_nfc_payment.png
index 3590a15..e4d8173 100644
--- a/res/drawable-xhdpi/ic_settings_nfc_payment.png
+++ b/res/drawable-xhdpi/ic_settings_nfc_payment.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_qs_certificate_info.png b/res/drawable-xxhdpi/ic_qs_certificate_info.png
new file mode 100644
index 0000000..5d6f6c7
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_qs_certificate_info.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment.png b/res/drawable-xxhdpi/ic_settings_nfc_payment.png
new file mode 100644
index 0000000..cdb495e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_nfc_payment.png
Binary files differ
diff --git a/res/layout/bluetooth_access.xml b/res/layout/bluetooth_access.xml
index 3bfb689..f398cef 100644
--- a/res/layout/bluetooth_access.xml
+++ b/res/layout/bluetooth_access.xml
@@ -40,7 +40,8 @@
             style="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dip"
+            android:layout_marginTop="20dip"
+            android:layout_marginBottom="20dip"
             android:text="@string/bluetooth_remember_choice" />
 
     </LinearLayout>
diff --git a/res/layout/preference_header_button_item.xml b/res/layout/preference_header_button_item.xml
new file mode 100644
index 0000000..ecbd14b
--- /dev/null
+++ b/res/layout/preference_header_button_item.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout of a header item in PreferenceActivity. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:descendantFocusability="blocksDescendants"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize">
+
+    <LinearLayout
+        android:layout_width="@dimen/header_icon_width"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:ellipsize="end"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+   <View
+       android:id="@+id/divider"
+       style="@style/VertDivider"
+       android:layout_marginTop="6dp"
+       android:layout_marginBottom="6dp" />
+
+   <ImageButton android:id="@+id/buttonWidget"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:layout_gravity="center"
+       android:padding="8dip"
+       android:focusable="false"
+       style="?android:attr/borderlessButtonStyle"
+       android:clickable="true" />
+
+
+</LinearLayout>
diff --git a/res/layout/preference_home_app.xml b/res/layout/preference_home_app.xml
new file mode 100644
index 0000000..8418161
--- /dev/null
+++ b/res/layout/preference_home_app.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingStart="@*android:dimen/preference_item_padding_side">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/home_app_pref"
+        android:focusable="true"
+        android:clickable="true"
+        android:gravity="center_vertical"
+        android:background="?android:attr/selectableItemBackground" >
+            <RadioButton
+                android:id="@+id/home_radio"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dip"
+                android:layout_marginEnd="4dip"
+                android:layout_gravity="center_vertical"
+                android:orientation="vertical"
+                android:clickable="false"
+                android:focusable="false" />
+            <ImageView
+                android:id="@+android:id/icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:minWidth="48dp"
+                android:scaleType="centerInside"
+                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"
+                />
+            <TextView
+                android:id="@+android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:layout_weight="1"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:ellipsize="end" />
+    </LinearLayout>
+    <View
+        android:id="@+id/home_divider"
+        android:layout_width="2dip"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+    <ImageView
+        android:id="@+id/home_app_uninstall"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="12dip"
+        android:paddingEnd="12dp"
+        android:src="@drawable/ic_menu_delete_holo_dark"
+        android:contentDescription="@string/home_app_uninstall_button"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d2dca44..e3ffaf2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Gekoppel"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Gekoppel (geen foon nie)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Gekoppel (geen media nie)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Gekoppel (geen foon of media nie)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ontkoppel"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ontkoppel tans…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-verbindingsversoek"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Raak om te koppel aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wil jy koppel aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Foonboek-versoek"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wil toegang hê tot jou kontakte en oproepgeskiedenis. Gee toegang aan %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Moenie weer vra nie"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Moenie weer vra nie"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Boodskapversoek"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot jou boodskappe verkry. Gee toegang aan %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum- en tydinstellings"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Kies tydsone"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Invoertoestel"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internettoegang"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling van internetverbinding"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal van mediaoudio ontkoppel word."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>sal van vryhandse oudio ontkoppel word."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal van invoertoestel ontkoppel word."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Gekoppel aan media-oudio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Gekoppel aan foonoudio"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Gekoppel aan lêeroordragbediener"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nie gekoppel aan lêeroordragbediener nie"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Gekoppel aan invoertoestel"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Aan toestel gekoppel vir internettoegang"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruik vir lêeroordrag"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gebruik vir invoer"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gebruik vir internettoegang"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dok-instellings"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gebruik dok vir oudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As luidsprekerfoon"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Stel Wi-Fi-warmkol op"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> draagbare Wi-Fi-warmkol"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Foon-luitoon"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profiele"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Voeg gebruiker of profiel by"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Laat programme en inhoud toe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programme met beperkings"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Brei instellings vir program uit"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Hierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Verander taal"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Verander lettergrootte"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalings"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Vra elke keer"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Stel as jou voorkeur?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkings"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Verwyder beperkings"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Verander PIN"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 7ee1e0e..238fcb5 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"አካባቢን ይቆጣጠሩ"</item>
     <item msgid="5753382310468855812">"የከፍተኛ ኃይል አካባቢ ተከታተል"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"አካባቢ"</item>
+    <item msgid="8677040780775113033">"አካባቢ"</item>
+    <item msgid="1660743989948992916">"አካባቢ"</item>
+    <item msgid="8791172739860195290">"ንዘር"</item>
+    <item msgid="383413555642128046">"እውቂያዎችን አንብብ"</item>
+    <item msgid="3654594895269697313">"ዕውቂያዎችዎን ይቀይሩ"</item>
+    <item msgid="7928393476362362538">"የጥሪ ምዝግብ ማስታወሻን ያንብቡ"</item>
+    <item msgid="6248591205254641116">"የጥሪ ምዝግብ ማስታወሻን ይቀይሩ"</item>
+    <item msgid="6093344633066170692">"የቀን መቁጠሪያ አንብብ"</item>
+    <item msgid="1334886368750347692">"የቀን መቁጠሪያን ይቀይሩ"</item>
+    <item msgid="1638204101698708656">"አካባቢ"</item>
+    <item msgid="2154671955760380322">"ማሳወቂያ ለጥፍ"</item>
+    <item msgid="4282477730595931828">"አካባቢ"</item>
+    <item msgid="4891423912898525905">"ወደ ስልክ ደውል"</item>
+    <item msgid="2623604824935968113">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ያንብቡ"</item>
+    <item msgid="4420177125221176306">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይጻፉ"</item>
+    <item msgid="3986142739951490025">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="3984213795861739778">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="3656243523752472788">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="8105802370238551510">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="1407766984645388488">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይላኩ"</item>
+    <item msgid="3527273606643794973">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ያንብቡ"</item>
+    <item msgid="4370895547001583812">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይጻፉ"</item>
+    <item msgid="4218544235221631789">"ቅንብሮችን ይቀይሩ"</item>
+    <item msgid="736541391767350377">"ከላይ ይሳሉ"</item>
+    <item msgid="5530815681721654194">"ማሳወቂያዎችን ይድረሱ"</item>
+    <item msgid="781213371706962767">"ካሜራ"</item>
+    <item msgid="1720492593061838172">"ኦዲዮ ቅረጽ"</item>
+    <item msgid="3493046322001257041">"ድምጽ አጫውት"</item>
+    <item msgid="136815868796597058">"ቅንጥብ ሰሌዳ አንብብ"</item>
+    <item msgid="5238692940326972503">"ቅንጥብ መለያ ቀይር"</item>
+    <item msgid="5753789168376302997">"የሚዲያ አዝራሮች"</item>
+    <item msgid="3265262911688671938">"የድምጽ ትኩረት"</item>
+    <item msgid="2098976479485046797">"ዋናው የድምጽ መቆጣጠሪያ"</item>
+    <item msgid="5660213838861789350">"የድምጽ መጠን"</item>
+    <item msgid="7983336752371254444">"የጥሪ መጠን"</item>
+    <item msgid="7878027809189330917">"የማህደረ መረጃ ክፍልፍል"</item>
+    <item msgid="7260546305036218513">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="9103719301075748925">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="7025966722295861512">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="4665183401128289653">"እንደነቃ አቆይ"</item>
+    <item msgid="8584357129746649222">"አካባቢ"</item>
+    <item msgid="7669257279311110599">"አካባቢ"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
     <item msgid="2560532955514699713">"መካከለኛ"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0ceb84d..9e96c0c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"ተገናኝቷል"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ተያይዟል (ምንም ስልክ የለም)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ተያይዟል (ምንም ማህደረ መረጃ የለም)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ተያይዟል (ምንም ስልክ ወይም ማህደረ መረጃ የለም)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"ተለያይቷል"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"በመለያየት ላይ..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"የብሉቱዝ ተያያዥ ጠይቅ"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"ወደ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ለመገናኘት ንካ::"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ወደ\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ለማያያዝ ይፈልጋሉ?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"የስልክ አድራሻ ጠይቅ"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s የአንተን ዕውቂያዎች እና የጥሪ ታሪኮች ለመድረስ ይፈልጋል ። ለ%2$s መድረስ ይሰጥ?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"ዳግመኛ አትጠይቅ"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ዳግመኛ አትጠይቅ"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"የመልዕክት ጥያቄ"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s የእርስዎን መልዕክቶች ሊደርስበት ይፈልጋል። መዳረሻ ለ%2$s ይሰጥ?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"የቀን እና ሰዓት ቅንብሮች"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ግቤት መሣሪያ"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"የበይነመረብ ድረስ"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"የበይነ መረብ ተያያዥ ማጋሪያ"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከማህድረ መረጃ ድምፅይለያያል።"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከእጅ ነፃኦዲዮ ይለያያል።"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከግቤት መሣሪያ ይለያያል።"</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ወደ ማህደረ  መረጃ  አውዲዮ ተያይዟል"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ወደ ስልክ አውዲዮ ተያይዟል"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ወደ ፋይል ዝውውር አገልጋይ ተያይዟል"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ከፋይል ዝውውር አገልጋይ ጋር አልተያያዘም"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ወደ ግቤት መሣሪያ ተያይዟል"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ለበይነመረብ ድረስ ወደ መሣሪያ ተያይዟል"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ለፋይል ዝውውር ተጠቀም"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ለውፅአት ተጠቀም"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ለበይነ መረብ ድረስ ተጠቀም"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ቅንብሮች ትከል"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ለድምፅ ትከል ተጠቀም"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"እንደ ተናጋሪ ስልክ"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"የWi-Fi መገናኛ ነጥብ ያዋቅሩ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ተንቀሳቃሽ የWi‑Fi መገናኛ ነጥብ"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android ድረስ ነጥብ"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
@@ -1690,7 +1702,7 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"ማዋቀሩን ለመቀጠል "<b>"ቀጣይ"</b>"ን ይንኩ።\n\nከተለየ የWi-Fi አውታረ መረብ ጋር ለመገናኘት "<b>"ተመለስ"</b>"ን ይንኩ።"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"አሳምርነቅቷል"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"አስምር ቦዝኗል"</string>
-    <string name="accessibility_sync_error" msgid="8703299118794272041">"የአሳምር ስህተት።"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"የአስምር ስህተት።"</string>
     <string name="sync_failed" msgid="1696499856374109647">"አመሳስል አልተሳካም"</string>
     <string name="sync_active" msgid="8476943765960863040">"አመሳስል የነቃ"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"አመሳስል"</string>
@@ -1703,7 +1715,7 @@
     <string name="sync_automatically" msgid="1682730255435062059">"የመተግበሪያ ውሂብ በራስ-አስምር"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"አስምር በርቷል"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"አስምር ጠፍቷል"</string>
-    <string name="sync_error" msgid="5060969083117872149">"የአሳምር ስህተት"</string>
+    <string name="sync_error" msgid="5060969083117872149">"የአስምር ስህተት"</string>
     <string name="last_synced" msgid="4242919465367022234">"ለመጨረሻ ጊዜ የተመሳሰለው <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"አሁን በማመሳሰል ላይ…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"ቅንብሮች  ተተኪ አኑር"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"ተሰናክሏል"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"ፈቃጅ"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"በማስፈጸም ላይ"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"ተጠቃሚዎች"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ተጠቃሚዎች እና መገለጫዎች"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"ተጠቃሚ ወይም መገለጫ አክል"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"መተግበሪያዎችን እና ይዘትን ይፍቀዱ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ገደቦች ያሏቸው መተግበሪያዎች"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"የመተግበሪያዎች ቅንብሮችን ዘርጋ"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ቋንቋ ይቀይሩ"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"ክፍያዎች"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"ሁልጊዜ ጊዜ ጠይቅ"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"እንደ ምርጫዎ ሆኖ ይዘጋጅ?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"ገደቦች"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"ገደቦችን አስወግድ"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"ፒን ቀይር"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 4a42c2a..d40080c 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"مراقبة الموقع"</item>
     <item msgid="5753382310468855812">"مراقبة موقع متميز"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"الموقع"</item>
+    <item msgid="8677040780775113033">"الموقع"</item>
+    <item msgid="1660743989948992916">"الموقع"</item>
+    <item msgid="8791172739860195290">"اهتزاز"</item>
+    <item msgid="383413555642128046">"قراءة جهات الاتصال"</item>
+    <item msgid="3654594895269697313">"تعديل جهات الاتصال"</item>
+    <item msgid="7928393476362362538">"قراءة سجل المكالمات"</item>
+    <item msgid="6248591205254641116">"تعديل سجل المكالمات"</item>
+    <item msgid="6093344633066170692">"قراءة التقويم"</item>
+    <item msgid="1334886368750347692">"تعديل التقويم"</item>
+    <item msgid="1638204101698708656">"الموقع"</item>
+    <item msgid="2154671955760380322">"نشر إشعار"</item>
+    <item msgid="4282477730595931828">"الموقع"</item>
+    <item msgid="4891423912898525905">"اتصال هاتفي"</item>
+    <item msgid="2623604824935968113">"‏قراءة الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="4420177125221176306">"‏كتابة الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="3986142739951490025">"‏تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="3984213795861739778">"‏تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="3656243523752472788">"‏تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="8105802370238551510">"‏تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="1407766984645388488">"‏إرسال الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="3527273606643794973">"‏قراءة الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="4370895547001583812">"‏كتابة الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="4218544235221631789">"تعديل الإعدادات"</item>
+    <item msgid="736541391767350377">"رسم في الأعلى"</item>
+    <item msgid="5530815681721654194">"إشعارات الدخول"</item>
+    <item msgid="781213371706962767">"الكاميرا"</item>
+    <item msgid="1720492593061838172">"تسجيل الصوت"</item>
+    <item msgid="3493046322001257041">"تشغيل الصوت"</item>
+    <item msgid="136815868796597058">"قراءة الحافظة"</item>
+    <item msgid="5238692940326972503">"تعديل الحافظة"</item>
+    <item msgid="5753789168376302997">"أزرار الوسائط"</item>
+    <item msgid="3265262911688671938">"التركيز على الصوت"</item>
+    <item msgid="2098976479485046797">"مستوى الصوت الرئيسي"</item>
+    <item msgid="5660213838861789350">"مستوى الصوت"</item>
+    <item msgid="7983336752371254444">"مستوى صوت الرنين"</item>
+    <item msgid="7878027809189330917">"مستوى صوت الوسائط"</item>
+    <item msgid="7260546305036218513">"مستوى صوت المنبّه"</item>
+    <item msgid="9103719301075748925">"مستوى صوت الإشعار"</item>
+    <item msgid="7025966722295861512">"مستوى صوت البلوتوث"</item>
+    <item msgid="4665183401128289653">"البقاء في الوضع النشط"</item>
+    <item msgid="8584357129746649222">"الموقع"</item>
+    <item msgid="7669257279311110599">"الموقع"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
     <item msgid="2560532955514699713">"متوسطة"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1e63dfd..7201c8e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل (بجهاز غير الهاتف)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل (بجهاز غير الوسائط)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل (بجهاز غير الهاتف أو الوسائط)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"غير متصل"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"جارٍ قطع الاتصال..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"طلب اتصال بلوتوث"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"المس للاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"هل تريد الاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"؟"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"طلب دفتر الهاتف"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"‏يريد %1$s الدخول إلى جهات الاتصال وسجل المكالمات. هل تريد منحه حق الدخول إلى %2$s؟"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"لا تسألني مرة أخرى"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"لا تسألني مرة أخرى"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"طلب الرسالة"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏يريد %1$s الدخول إلى رسائلك. هل تريد منح %2$s حق الدخول؟"</string>
     <string name="date_and_time" msgid="4114084177056654663">"إعدادات التاريخ والوقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"اختيار المنطقة الزمنية"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"جهاز الإرسال"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"الدخول إلى الإنترنت"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"مشاركة اتصال الإنترنت"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت الوسائط."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت السماعة بدون استخدام اليدين."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من جهاز الإرسال."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"متصل بالإعدادات الصوتية للوسائط"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"متصل بالإعدادات الصوتية للهاتف"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"متصل بخادم نقل الملف"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"غير متصل بخادم نقل الملفات"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"متصل بجهاز الإدخال"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"متصل بالجهاز لدخول الإنترنت"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"استخدامه لنقل الملفات"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"استخدام للإدخال"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"الاستخدام للدخول على الإنترنت"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"إعدادات الإرساء"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"استخدام الإرساء للإعدادات الصوتية"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"كهاتف بسماعة خارجية"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"‏إعداد نقطة اتصال Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"‏نقطة اتصال إعداد نقطة اتصال Wi-Fi المحمولة <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"معطّل"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"متساهل"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"فرض"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"المستخدمون"</string>
     <string name="user_list_title" msgid="7937158411137563543">"المستخدمون والملفات الشخصية"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"إضافة مستخدم أو ملف شخصي"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"السماح بالتطبيقات والمحتوى"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"التطبيقات ذات القيود"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسيع إعدادات التطبيق"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"يؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغيير اللغة"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"تغيير حجم الخط"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"الدفعات المالية"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"الطلب في كل مرة"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"هل تريد تعيينه كتفضيل؟"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"القيود"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"إزالة القيود"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغيير رقم التعريف الشخصي"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 6c01b38..3089e4d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Падключаны"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Падключана (без тэлефона)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Падключэнне (без носьбіта)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Падключаны (без тэлефона або носьбіта)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Адключана"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Адключэнне..."</string>
@@ -163,12 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запыт злучэння Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Націсніце, каб падключыцца да прылады \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Падлучыцца да прылады \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Запыт тэлефоннай кнігі"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s спрабуе атрымаць доступ да вашых кантактаў і гісторыі выклікаў. Дазволіць доступ тэлефоннай кнiзе %2$s?"</string>
     <!-- no translation found for bluetooth_remember_choice (6198284561603824931) -->
     <skip />
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Больш не пытацца"</string>
-    <!-- no translation found for bluetooth_map_request (1541931183213124878) -->
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
     <skip />
     <!-- no translation found for bluetooth_map_acceptance_dialog_text (8712508202081143737) -->
     <skip />
@@ -485,6 +488,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Прылада ўводу"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Доступ у інтэрнэт"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Прадастаўленне доступу да Інтэрнэту"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будзе адключаная ад аўдыёфайлаў."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будзе адключаная ад аудыёгарнітуры."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будзе адключаная ад прылады ўводу."</string>
@@ -500,6 +505,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Падключана да аўдыё медыа"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Падключана да аўдыё тэлефона"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Падключаны да серверу перадачы файлаў"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Няма падключэння да серверу перадачы файлаў"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Падключана да прылады ўводу"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Прылада для дост. ў Iнт."</string>
@@ -509,6 +516,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Выкарыстоўваць для перадачы файлаў"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Выкарыстоўваць для ўводу"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Выкарыстоўвайце для доступу ў Інтэрнэт"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Налады док-станцыі"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Выкарыстоўваць док-станцыю для аўдыё"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як гучная сувязь"</string>
@@ -709,6 +718,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Наладка кропкi доступу Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Партатыўная кропка доступу Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Гук"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодыя тэлефона"</string>
@@ -2024,6 +2035,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Выключана"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Дазвол"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Забеспячэнне"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Карыстальнікі"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Карыстальнікi і профілi"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Дадаць карыстальніка або профіль"</string>
@@ -2069,15 +2092,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Дазволіць прыкладанні і змесціва"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Прыкладанні з абмежаваннямі"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Разгарнуць параметры прыкладання"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага планшэта."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змяніць мову"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Змяніць памер шрыфту"</string>
     <!-- no translation found for nfc_payment_settings_title (1121386157283141856) -->
     <skip />
-    <!-- no translation found for nfc_payment_ask (1061129391464251903) -->
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
     <skip />
-    <!-- no translation found for nfc_payment_set_default (1583397933053078296) -->
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
     <skip />
     <!-- no translation found for restriction_settings_title (4233515503765879736) -->
     <skip />
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 131c598..92eee7e 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"наблюдение на местоположението"</item>
     <item msgid="5753382310468855812">"наблюдение на заявките за местоположение, изразходващи много енергия"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Местоположение"</item>
+    <item msgid="8677040780775113033">"Местоположение"</item>
+    <item msgid="1660743989948992916">"Местоположение"</item>
+    <item msgid="8791172739860195290">"Вибриране"</item>
+    <item msgid="383413555642128046">"Четене на контактите"</item>
+    <item msgid="3654594895269697313">"Промяна на контактите"</item>
+    <item msgid="7928393476362362538">"Четене на списъка с обажданията"</item>
+    <item msgid="6248591205254641116">"Промяна на списъка с обажданията"</item>
+    <item msgid="6093344633066170692">"Четене на календара"</item>
+    <item msgid="1334886368750347692">"Промяна на календара"</item>
+    <item msgid="1638204101698708656">"Местоположение"</item>
+    <item msgid="2154671955760380322">"Публикуване на известие"</item>
+    <item msgid="4282477730595931828">"Местоположение"</item>
+    <item msgid="4891423912898525905">"Обаждане по телефона"</item>
+    <item msgid="2623604824935968113">"Четене на SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Писане на SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Получаване на SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Получаване на SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Получаване на SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Получаване на SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Изпращане на SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Четене на SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Писане на SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Промяна на настройките"</item>
+    <item msgid="736541391767350377">"Рисуване върху елемент"</item>
+    <item msgid="5530815681721654194">"Достъп до известията"</item>
+    <item msgid="781213371706962767">"Камера"</item>
+    <item msgid="1720492593061838172">"Запис на звук"</item>
+    <item msgid="3493046322001257041">"Възпроизвеждане на звук"</item>
+    <item msgid="136815868796597058">"Четене на буферната памет"</item>
+    <item msgid="5238692940326972503">"Промяна на буферната памет"</item>
+    <item msgid="5753789168376302997">"Бутони за мултимедия"</item>
+    <item msgid="3265262911688671938">"Фокусиране на звука"</item>
+    <item msgid="2098976479485046797">"Основна сила на звука"</item>
+    <item msgid="5660213838861789350">"Сила на звука за глас"</item>
+    <item msgid="7983336752371254444">"Сила на звука при звънене"</item>
+    <item msgid="7878027809189330917">"Сила на звука за мултимедия"</item>
+    <item msgid="7260546305036218513">"Сила на звука на будилника"</item>
+    <item msgid="9103719301075748925">"Сила на звука при известие"</item>
+    <item msgid="7025966722295861512">"Сила на звука за Bluetooth"</item>
+    <item msgid="4665183401128289653">"Оставяне в будно състояние"</item>
+    <item msgid="8584357129746649222">"Местоположение"</item>
+    <item msgid="7669257279311110599">"Местоположение"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средно"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 33a9529..479ea47 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Установена е връзка"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Свързано (без телефона)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Свързано (без мултимедията)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Свързано (без телефона или мултимедията)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Изкл."</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Изключва се..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Заявка за свързване чрез Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Докоснете, за да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Искате ли да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Заявка за телефонен указател"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"От %1$s се иска достъп до вашите контакти и история на обажданията. Да се даде ли достъп до %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Без повторно питане"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Без повторно питане"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Заявка за достъп до съобщенията"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s иска достъп до съобщенията ви. Ще предоставите ли достъп до %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки за дата и час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор на часова зона"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Входно устройство"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Достъп до интернет"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделяне на връзката с интернет"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Връзката между <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и мултимедийното аудио ще бъде прекъсната."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Връзката между <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и аудиото от „свободни ръце“ ще бъде прекъсната."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Връзката между <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и устройството за въвеждане ще бъде прекъсната."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Установена е връзка с медийно аудио"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Връзка със звука на телефона"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установена е връзка със сървър за трансфер на файлове"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Няма връзка със сървър за трансфер на файлове"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Има връзка с устройството за въвеждане"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Има връзка с у-во за достъп до интернет"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Използване на за пренос на файлове"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Да се използва за въвеждане"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Използване за достъп до интернет"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Настройки за докинг станция"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Използване на докинг аудиостанция"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Като високоговорител"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Настройка на точката за достъп до Wi‑Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Преносима точка за достъп до Wi‑Fi: <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Деактивирано"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Разрешаващо"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Налагане"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Потребители"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Потребители и потребителски профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Добавяне на потр. или потр. профил"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешаване на приложения и съдържание"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничения"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Настройки за прилож.: Разгъв."</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Настройката засяга всички потребители на този таблет."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройката засяга всички потребители на този телефон."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промяна на езика"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Промяна на размера на шрифта"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Плащания"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Да се пита винаги"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Да се зададе ли като ваше предпочитание?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Oграничения: Премахване"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промяна на ПИН кода"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 88db159..40abbbc 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -143,7 +143,7 @@
     <item msgid="8151962652413645395">"2 minuts"</item>
     <item msgid="8675215713017289017">"5 minuts"</item>
     <item msgid="477015974247590543">"1 hora"</item>
-    <item msgid="5198271470953124739">"Sense temps d\'espera"</item>
+    <item msgid="5198271470953124739">"Sempre visible"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dolenta"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7f1ecb0..46c9f22 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -41,7 +41,7 @@
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Activa l\'abocament de ram lte"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Desactiva l\'abocament de ram lte"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualitza la llibreta d\'adreces de la SIM"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualitza els números de marcatge fix"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Mostra els números de marcatge fix"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Visualitza els números de marcatge de serveis"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Obtén la llista PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"En servei"</string>
@@ -114,7 +114,7 @@
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible per a tots els dispositius Bluetooth propers"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ocult per a altres dispositius Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Només visible per als dispositius sincronitzats"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps d\'espera de la visib."</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps de visibilitat"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloqueja el marcatge per veu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedeix l\'ús del marcador Bluetooth quan la pantalla estigui bloquejada"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositius Bluetooth"</string>
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connectat"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connectats (sense telèfon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connectat (sense fitxers multimèdia)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connectat (sense telèfon o disp. mult.)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconnectat"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"S\'està desconnectant..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Sol·licitud de connexió de Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toca per connectar-te a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vols connectar-te a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Sol·licitud de llibreta de telèfons"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"A %1$s li agradaria accedir als teus contactes i a l\'historial de trucades. Vols donar accés a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"No m\'ho tornis a preguntar"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No m\'ho tornis a preguntar"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Sol·licitud de missatge"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vol accedir als teus missatges. Vols donar-li accés a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuració de data i hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecció de la zona horària"</string>
@@ -284,7 +288,7 @@
     <string name="networks" msgid="6333316876545927039">"Selecció d\'operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Selecciona un operador de xarxa"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i hora"</string>
-    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establiment de data i d\'hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Estableix la data i l\'hora"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Defineix la data, l\'hora, la zona horària i els formats"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Data i hora automàtiques"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilitza l\'hora proporcionada per la xarxa"</string>
@@ -366,7 +370,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivell de seguretat mitjà o alt"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasenya"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivell de seguretat alt"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivada per administrador, política d\'encriptació o emmagatzematge de credencials"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivat per administrador, política d\'encriptació o emmagatzematge de credencials"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Cap"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Lliscar"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueig facial"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositiu d\'entrada"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accés a Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Connexió compartida a Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio del mitjà."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio de mans lliures."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà del dispositiu d\'entrada."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connectat a l\'àudio del mitjà"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connectat a àudio del telèfon"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connectat al servidor de transferència de fitxers"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No està connectat al servidor de transferència de fitxers"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connectat a dispositiu d\'entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connectat al dispositiu per a accés a Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilitza per a la transferència de fitxers"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilitza per a entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilitza\'l per a l\'accés a Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuració de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ús de la base per a àudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configura la zona Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portàtil"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"To de trucada"</string>
@@ -947,7 +959,7 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restableix el telèfon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vols esborrar tota la informació personal i les aplicacions baixades? Aquesta acció no es pot desfer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Esborra-ho tot"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuixeu el perfil de desbloqueig"</string>
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuixa el patró de desbloqueig"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Has de dibuixar el teu patró de desbloqueig per confirmar el restabliment de dades de fàbrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Restablir?"</string>
@@ -962,10 +974,10 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vols esborrar l\'emmagatzematge USB i suprimir tots els fitxers que hi ha emmagatzemats? Aquesta acció no es pot desfer."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vols esborrar la targeta SD i suprimir tots els fitxers que hi ha emmagatzemats? Aquesta acció no es pot desfer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Esborra-ho tot"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dibuixeu el perfil de desbloqueig"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Crea el teu patró de desbloqueig"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar l\'emmagatzematge USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar la targeta SD."</string>
-    <string name="call_settings_title" msgid="5188713413939232801">"Configuració de trucada"</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"Configuració de trucades"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ancoratge d\'USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portàtil"</string>
@@ -1000,7 +1012,7 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connecta a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"La meva ubicació"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Gran precisió"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisió"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Estalvi de bateria"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Només sensors de dispositiu"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicació desactivada"</string>
@@ -1010,9 +1022,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Ús de bateria elevat"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Ús de bateria reduït"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode d\'ubicació"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Ús de GPS, Wi‑Fi i xarxes mòbils per calcular ubic."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Ús de Wi-Fi i xarxes mòbils per calcular la ubic."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Ús de GPS per determinar ubic."</string>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Calcula ubicació amb Wi-Fi i xarxes mòbils"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Calcula ubicació amb Wi-Fi i xarxes mòbils"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Determina ubicació amb GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"S\'està recuperant..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Ubicació p. Wi-Fi i xarxa mòb."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
@@ -1044,11 +1056,11 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informació de seguretat"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"No tens cap connexió de dades. Per visualitzar aquesta informació ara, dirigeix-te a %s des d\'un equip connectat a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"S\'està carregant…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Trieu la contrasenya"</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Trieu una contrasenya"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Tria el teu patró"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecció del PIN"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona un PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma la teva contrasenya"</string>
-    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el teu patró"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patró"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmació del PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Les contrasenyes no coincideixen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Els codis PIN no coincideixen"</string>
@@ -1059,9 +1071,9 @@
     <string name="lock_settings_title" msgid="335025124489630932">"Seguretat de la pantalla"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Canvia el PIN de desbloqueig"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmeu el patró desat"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma el patró desat"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Torna-ho a provar:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dibuixeu un perfil de desbloqueig"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Crea un patró de desbloqueig"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premeu Menú per obtenir ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Deixa anar el dit en acabar"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Connecta <xliff:g id="NUMBER">%d</xliff:g> punts com a mínim. Torna-ho a provar."</string>
@@ -1327,18 +1339,18 @@
     <string name="enable_adb" msgid="7982306934419797485">"Depuració USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Activa el mode de depuració quan el dispositiu estigui connectat per USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revoca autoritzacions depuració USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Informe d\'error al menú"</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="bugreport_in_power" msgid="4548816486587403971">"Informe d\'error al menú d\'engegada"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclou una opció al menú d\'engegada per generar un informe d\'error"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no entra mai en mode de repòs si el dispositiu està carregant-se"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activa el registre de cerca HCI de Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Captura tots els paquets HCI de Bluetooth en un fitxer"</string>
-    <string name="select_runtime_title" msgid="649783802363155346">"Selecciona temps execució"</string>
-    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecciona temps execució"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Selecciona temps d\'execució"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecciona temps d\'execució"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vols tornar a iniciar per canviar el temps d\'execució de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificació de pantalla sense fil"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra les opcions per a la certificació de pantalla sense fil"</string>
-    <string name="allow_mock_location" msgid="2787962564578664888">"Permet les ubicacions simulades"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ubicacions simulades"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuració USB només està indicada per a activitats de desenvolupament. Fes-la servir intercanviar dades entre l\'ordinador i el dispositiu, per instal·lar aplicacions al dispositiu sense rebre notificacions i per llegir dades de registre."</string>
@@ -1454,7 +1466,7 @@
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla activada"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activat"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
-    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Despert"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Activa"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Senyal de xarxa mòbil"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
@@ -1609,7 +1621,7 @@
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiança"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipus d\'emmagatzematge"</string>
-    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"En maquinari"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Emmagatzemat en maquinari"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Només programari"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuixa el patró de desbloqueig"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string>
@@ -1749,13 +1761,13 @@
     <string name="debug_app" msgid="8349591734751384446">"Aplicació per depurar"</string>
     <string name="debug_app_not_set" msgid="718752499586403499">"No s\'ha definit cap aplicació per depurar"</string>
     <string name="debug_app_set" msgid="2063077997870280017">"Aplicació per depurar: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="select_application" msgid="5156029161289091703">"Selecció de l\'aplicació"</string>
+    <string name="select_application" msgid="5156029161289091703">"Selecciona l\'aplicació"</string>
     <string name="no_application" msgid="2813387563129153880">"Cap"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"Espera el depurador"</string>
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Abans d\'executar-se, l\'aplicació de depuració espera que es connecti el depurador."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Dibuix"</string>
-    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Publicació accelerada per maquinari"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Renderització accelerada per maquinari"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Supervisió"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Mode estricte"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Centelleja si les aplicacions triguen molt al procés principal"</string>
@@ -1771,12 +1783,12 @@
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Il·lumina capes de maquinari en verd en actualitzar-se"</string>
     <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depura modificacions GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desactiva superposicions HW"</string>
-    <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per combinar pantalles"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilitza sempre GPU per combinar pantalles"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa seguiment d\'OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostra límits de disseny"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra els límits de clips, els marges, etc."</string>
-    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Força disseny dreta-esq."</string>
-    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Força disseny pantalla dreta-esq. totes config."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Força direcció dreta-esquerra"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Força direcció de pantalla dreta-esquerra en totes les llengües"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra l\'ús de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposa l\'ús de la CPU a la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Força acceleració GPU"</string>
@@ -1794,7 +1806,7 @@
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destrueix activitats quan l\'usuari deixi d\'usar-les"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Límita processos en segon pla"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tots els errors sense resposta"</string>
-    <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostra L\'aplicació no respon per a aplicacions de segon pla"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"Informa que una aplicació en segon pla no respon"</string>
     <string name="experimental_webview" msgid="4492200819033780927">"Fes servir WebView experimental"</string>
     <string name="experimental_webview_summary" msgid="3431620080869482446">"Les aplicacions utilitzaran el WebView nou (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Usuaris"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuaris i perfils"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Afegeix un usuari o un perfil"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacions amb restriccions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Amplia configuració aplicació"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Aquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Canvi de l\'idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Canvi del cos de lletra"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagaments"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Pregunta sempre"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vols establir-ho com a preferència?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restriccions"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Suprimeix restriccions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Canvia el PIN"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index e67172e..b4a1d81 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -411,7 +411,7 @@
     <item msgid="1069584980746680398">"Měřítko animace 10x"</item>
   </string-array>
   <string-array name="overlay_display_devices_entries">
-    <item msgid="1606809880904982133">"Žádné"</item>
+    <item msgid="1606809880904982133">"Žádný"</item>
     <item msgid="688482401508173818">"720x480 mdpi"</item>
     <item msgid="6027541158956821790">"720x480 mdpi (zabezpečené)"</item>
     <item msgid="8181151155909301030">"1280x720 tvdpi"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 212376f..c4475ff 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -26,7 +26,7 @@
     <item quantity="one" msgid="5295687242294085452">"Ještě <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí a bude z vás vývojář."</item>
     <item quantity="other" msgid="6722953419953594148">"Ještě <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí a bude z vás vývojář."</item>
   </plurals>
-    <string name="show_dev_on" msgid="1110711554982716293">"Nyní jste vývojář."</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"Voilà! Stal se z vás vývojář."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Není potřeba, již jste vývojář."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÁTOVÁ PŘIPOJENÍ A SÍTĚ"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ZAŘÍZENÍ"</string>
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Připojeno"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Připojeno (žádný telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Připojeno (žádná média)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Připojeno (žádný telefon nebo média)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojeno"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Odpojování..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Požadavek na připojení zařízení Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Klepnutím se připojíte k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete se připojit k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Požadavek telefonního seznamu"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Zařízení %1$s žádá o přístup k vašim kontaktům a historii hovorů. Povolit zařízení %2$s přístup?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Příště se neptat"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Příště se neptat"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Žádost o zprávu"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zařízení %1$s žádá o přístup k vašim zprávám. Povolit přístup zařízení %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavení data a času"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vybrat časové pásmo"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupní zařízení"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Přístup k internetu"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Sdílení internetového připojení"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku médií."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku sady handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od vstupního zařízení."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Připojeno ke zvukovému médiu"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Připojeno k náhlavní soupravě"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Připojeno k serveru pro přenos dat"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepřipojeno k serveru pro přenos souborů"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Připojeno ke vstupnímu zařízení"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Připojeno k zařízení za účelem přístupu k internetu"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použít pro přenos souborů"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použít pro vstup"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použít pro přístup k internetu"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavení doku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Použít zvuk doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon pro hlasitý poslech"</string>
@@ -575,7 +585,7 @@
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi aktivní i 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="1220174276403689487">"Optimalizace Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovat využití baterie při zapnuté síti Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovat využívání baterie při zapnuté síti Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Přidat síť"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Sítě Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačítko WPS"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastavit hotspot sítě Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Přenosný hotspot Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
@@ -765,7 +777,7 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vyp."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Chcete-li nastavit, co se má stát, když se telefon ocitne v doku nebo v režimu spánku, zapněte spořič obrazovky."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdy spořič spustit"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začít"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Spustit"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavení"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
@@ -1004,18 +1016,18 @@
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Úspora baterie"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Pouze senzory zařízení"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Poloha vypnuta"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedávné žádosti o urč. polohy"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedávné žádosti o určení polohy"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslední době žádné aplikace o polohu nepožádaly."</string>
     <string name="location_category_app_settings" msgid="46434611182743486">"Nastavení aplikací"</string>
-    <string name="location_high_battery_use" msgid="517199943258508020">"Vysoké využití baterie"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Nízké využití baterie"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"Vysoké využívání baterie"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Nízké využívání baterie"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určování polohy"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Poloha: GPS, Wi-Fi a mob. síť"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Poloha: Wi-Fi a mob. síť"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Urč. přes. polohy pomocí GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"K určení polohy použít GPS, Wi-Fi a mobilní síť"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"K určení polohy použít Wi-Fi a mobilní síť"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"K určení polohy použít GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Načítání…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilní sítě"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu polohy Google a rychleji odhadovat vaši polohu. Anonymní data budou sbírána a odesílána Googlu."</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu určování polohy Google a rychleji odhadovat vaši polohu. Anonymní data budou sbírána a odesílána Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha určená sítí Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Povolit aplikacím ve vašem tabletu určovat polohu pomocí GPS"</string>
@@ -1123,13 +1135,13 @@
     <string name="app_factory_reset" msgid="6635744722502563022">"Odinstalovat aktualizace"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aplikace byla nastavena, aby se pro některé akce spouštěla jako výchozí."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Této aplikaci jste povolili vytváření widgetů a přístup k jejich datům."</string>
-    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Není výchozí pro žádné akce."</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Není nastavena jako výchozí pro žádné akce"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Vymazat výchozí nastavení"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Tato aplikace nejspíš není určena pro vaši obrazovku. Zde můžete nastavit, jak se aplikace obrazovce přizpůsobí."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Dotázat se při spuštění"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Upravit velikost aplikace"</string>
     <string name="unknown" msgid="1592123443519355854">"Neznámé"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"Seřadit dle jména"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Seřadit podle jména"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Řadit podle velikosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Zobrazit spuštěné služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Zobrazit mezipaměť"</string>
@@ -1328,10 +1340,10 @@
     <string name="enable_adb_summary" msgid="4881186971746056635">"Povolit režim ladění s připojeným zařízením USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Zrušit autorizace k ladění 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="bugreport_in_power_summary" msgid="5764234382355067053">"Zahrnout v hlavní nabídce možnost k vytvoření chybového hlášení"</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="bt_hci_snoop_log" msgid="3340699311158865670">"Povolit sledovací protokol Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povolit protokol Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</string>
     <string name="select_runtime_title" msgid="649783802363155346">"Výběr modulu runtime"</string>
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výběr modulu runtime"</string>
@@ -1356,7 +1368,7 @@
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chránit kartu SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Pokud je karta SD chráněná, musejí aplikace před čtením dat z externího úložiště požádat o povolení.\n\nNěkteré aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
     <string name="enable_terminal_title" msgid="95572094356054120">"Místní terminál"</string>
-    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivovat terminálovou apl. pro místní přístup k prostředí shell"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivovat terminálovou aplikaci pro místní přístup k prostředí shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Zvolte gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Zvolte widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvořit widget a povolit přístup?"</string>
@@ -1381,7 +1393,7 @@
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Je-li tato funkce zapnutá, můžete zobrazení přibližovat a oddalovat tak, že třikrát klepnete na obrazovku.\n\nPři přiblížení můžete provádět tyto činnosti:\n"<ul><li>"Posunutí: táhněte po obrazovce minimálně dvěma prsty."</li>\n<li>"Změna úrovně přiblížení: alespoň dva prsty stáhněte k sobě, nebo roztáhněte od sebe."</li></ul>\n\n"Také je možné dočasně zvětšit oblast pod prstem. Stačí na ni třikrát klepnout a podržet ji. V takto zvětšeném náhledu můžete přetáhnutím prstu prohlížet libovolné části obrazovky. Do předchozího zobrazení se vrátíte zdvihnutím prstu.\n\nPoznámka: Zvětšení trojitým klepnutím funguje ve všech částech obrazovky s výjimkou klávesnice a navigační lišty."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Zkratka usnadnění"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Zapnuto"</string>
-    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vyp."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vypnuto"</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Je-li tato funkce zapnutá, můžete rychle ve dvou krocích aktivovat funkce usnadnění přístupu:\n\nKrok 1: Stiskněte tlačítko napájení a držte jej, dokud neuslyšíte zvuk nebo neucítíte vibraci.\n\nKrok 2: Dotkněte se obrazovky dvěma prsty a držte ji, dokud neuslyšíte potvrzovací zvuk.\n\nMá-li zařízení více uživatelů, pomocí této zkratky lze na uzamčené obrazovce dočasně aktivovat usnadnění přístupu, dokud zařízení nebude odemčeno."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Velký text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Přiblížení obrazovky"</string>
@@ -1463,8 +1475,8 @@
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Doba provozu modulu Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti historie"</string>
-    <string name="details_title" msgid="3792801565213935385">"Podrobnosti používání"</string>
-    <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti používání"</string>
+    <string name="details_title" msgid="3792801565213935385">"Podrobnosti využívání"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti využívání"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Upravit spotřebu energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
     <string name="power_screen" msgid="3023346080675904613">"Displej"</string>
@@ -1519,7 +1531,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiky procesů"</string>
-    <string name="process_stats_summary" msgid="109387941605607762">"Prapodivné statistiky běžících procesů"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Podrobné statistiky běžících procesů"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využití paměti"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistiky jsou ukončeny <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktuální stav paměti zařízení: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
@@ -1702,7 +1714,7 @@
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Deaktivace přenosu dat na pozadí šetří baterii a snižuje objem přenesených dat. Některé aplikace mohou přesto datové připojení na pozadí používat."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Autom. synch. data aplikací"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronizace ZAP."</string>
-    <string name="sync_disabled" msgid="8511659877596511991">"Synchronizace VYP."</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronizace vypnuta"</string>
     <string name="sync_error" msgid="5060969083117872149">"Chyba synchronizace"</string>
     <string name="last_synced" msgid="4242919465367022234">"Poslední synchronizace <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Probíhá synchronizace..."</string>
@@ -1764,39 +1776,39 @@
     <string name="show_touches" msgid="1356420386500834339">"Zobrazit dotyky"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Zobrazit vizuální zpětnou vazbu pro doteky"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"Zobrazit obnovení obsahu"</string>
-    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Celý obsah okna při obnovení bliká."</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Rozblikat obsah okna při aktualizaci"</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="debug_hw_overdraw" msgid="2968692419951565417">"Ladění překreslování GPU"</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="show_hw_layers_updates" msgid="5645728765605699821">"Zobrazit aktual. HW vrstev"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Rozblikat zeleně hardwarové vrstvy při aktualizaci"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ladit překreslování GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Zakázat hardwarové vrstvy"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povolit trasování OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobrazit ohraničení"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobrazit u klipu ohraničení, okraje atd."</string>
-    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vynutit směr rozvrž. RTL"</string>
-    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vynutit ve všech jazycích směr rozvržení obr. RTL"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vynutit směr RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vynutit ve všech jazycích směr rozvržení obrazovky RTL (zprava doleva)"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobrazit využití CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Překryvná vrstva s aktuálním využitím procesoru"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vykreslování pomocí GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Vynutit použití GPU pro 2D vykreslování"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Vynutit 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Povolit 4x MSAA v aplikacích OpenGL ES 2.0"</string>
-    <string name="show_non_rect_clip" msgid="505954950474595172">"Ladění operací s neobdélníkovými výstřižky"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Ladit operace s neobdélníkovými klipy"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil – vykreslování GPU"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Měřítko animace okna"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Měřítko animace přeměny"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Měřítko délky animace"</string>
-    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulovat sekun. displeje"</string>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulovat sekundární displeje"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikace"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neukládat aktivity"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Rušit všechny činnosti, jakmile je uživatel zavře"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Omezení procesů na pozadí"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Zobrazit všechny ANR"</string>
-    <string name="show_all_anrs_summary" msgid="641908614413544127">"Dialog Aplikace neodpovídá pro aplikace na pozadí"</string>
-    <string name="experimental_webview" msgid="4492200819033780927">"Použít zkušební zob. webu"</string>
-    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikace použijí nejnovější zobrazení webu (beta)"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"Dialog „Aplikace neodpovídá“ pro aplikace na pozadí"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Experimentální WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikace použijí nejnovější WebView (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Přenesená data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítání dat"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Datový roaming"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Uživatelé"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Uživatelé a profily"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Přidat uživatele nebo profil"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Povolit aplikace a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikace s omezením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbalit nastavení aplikace"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Změna velikosti písma"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Platby"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Vždy se dotázat"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nastavit jako předvolbu?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Nastavit jako předvolbu?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Chcete při placení dotykem telefonu vždy používat aplikaci <xliff:g id="APP">%1$s</xliff:g>?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Chcete při placení dotykem telefonu namísto aplikace <xliff:g id="APP_1">%2$s</xliff:g> vždy používat aplikaci <xliff:g id="APP_0">%1$s</xliff:g>?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Omezení"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odebrat omezení"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Změnit PIN"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 64f8d91..95b5edd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Tilsluttet"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Forbundet (ingen telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tilsluttet (intet medie)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Forbundet (ingen telefon eller medier)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Afbrudt"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Afbryder ..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Anmodning om Bluetooth-forbindelse"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Tryk for at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Anmodning om telefonbog"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s vil gerne have adgang til dine kontaktpersoner og opkaldsoversigt. Vil du give %2$s adgang?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Spørg ikke igen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Spørg ikke igen"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Beskedanmodning"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vil gerne have adgang til dine beskeder. Vil du give %2$s adgang?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Indstillinger for dato og tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vælg tidszone"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inputenhed"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetadgang"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling af internetforbindelse"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra håndfri lyd."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra inputenheden."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Forbundet til medielyd"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Forbundet til telefonlyd"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Forbundet til filoverførselsserver"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke forbundet til filoverførselsserver"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Forbundet til inputenhed"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tilsluttet enhed/internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Brug til filoverførsel"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Brug til input"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Brug til internetadgang"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Indstillinger af Dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Brug dock til audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som højttalertelefon"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfiguration af Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone for telefon"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Brugere"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Brugere og profiler"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Tilføj en bruger eller en profil"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Tillad apps og indhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applikationer med begrænsninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Udvid indstillingerne for applikationen"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Denne indstilling påvirker alle brugere på denne tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Skift sprog"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Skift skriftstørrelse"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalinger"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Spørg hver gang"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vil du angive dette som din præference?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Vil du angive dette som din præference?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"VIl du altid bruge <xliff:g id="APP">%1$s</xliff:g>, når du bruger peg og betal?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Vil du altid bruge <xliff:g id="APP_0">%1$s</xliff:g> i stedet for <xliff:g id="APP_1">%2$s</xliff:g>, når du bruger peg og betal?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Begrænsninger"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrænsninger"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Skift pinkode"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index e275939..a5ea6ea 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"Standort beobachten"</item>
     <item msgid="5753382310468855812">"Orte mit hohem Stromverbrauch überwachen"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Standort"</item>
+    <item msgid="8677040780775113033">"Standort"</item>
+    <item msgid="1660743989948992916">"Standort"</item>
+    <item msgid="8791172739860195290">"Vibration"</item>
+    <item msgid="383413555642128046">"Kontakte lesen"</item>
+    <item msgid="3654594895269697313">"Kontakte ändern"</item>
+    <item msgid="7928393476362362538">"Anrufliste lesen"</item>
+    <item msgid="6248591205254641116">"Anrufliste ändern"</item>
+    <item msgid="6093344633066170692">"Kalender lesen"</item>
+    <item msgid="1334886368750347692">"Kalender ändern"</item>
+    <item msgid="1638204101698708656">"Standort"</item>
+    <item msgid="2154671955760380322">"Benachrichtigung posten"</item>
+    <item msgid="4282477730595931828">"Standort"</item>
+    <item msgid="4891423912898525905">"Telefonieren"</item>
+    <item msgid="2623604824935968113">"SMS/MMS lesen"</item>
+    <item msgid="4420177125221176306">"SMS/MMS schreiben"</item>
+    <item msgid="3986142739951490025">"SMS/MMS empfangen"</item>
+    <item msgid="3984213795861739778">"SMS/MMS empfangen"</item>
+    <item msgid="3656243523752472788">"SMS/MMS empfangen"</item>
+    <item msgid="8105802370238551510">"SMS/MMS empfangen"</item>
+    <item msgid="1407766984645388488">"SMS/MMS senden"</item>
+    <item msgid="3527273606643794973">"SMS/MMS lesen"</item>
+    <item msgid="4370895547001583812">"SMS/MMS schreiben"</item>
+    <item msgid="4218544235221631789">"Einstellungen ändern"</item>
+    <item msgid="736541391767350377">"An oberste Position ziehen"</item>
+    <item msgid="5530815681721654194">"Auf Benachrichtigungen zugreifen"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Audio aufnehmen"</item>
+    <item msgid="3493046322001257041">"Audio wiedergeben"</item>
+    <item msgid="136815868796597058">"Zwischenablage lesen"</item>
+    <item msgid="5238692940326972503">"Zwischenablage ändern"</item>
+    <item msgid="5753789168376302997">"Medienschaltflächen"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Gesamtlautstärke"</item>
+    <item msgid="5660213838861789350">"Sprachlautstärke"</item>
+    <item msgid="7983336752371254444">"Klingeltonlautstärke"</item>
+    <item msgid="7878027809189330917">"Medienlautstärke"</item>
+    <item msgid="7260546305036218513">"Weckerlautstärke"</item>
+    <item msgid="9103719301075748925">"Benachrichtigungslautstärke"</item>
+    <item msgid="7025966722295861512">"Bluetooth-Lautstärke"</item>
+    <item msgid="4665183401128289653">"Aktiv lassen"</item>
+    <item msgid="8584357129746649222">"Standort"</item>
+    <item msgid="7669257279311110599">"Ort"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
     <item msgid="2560532955514699713">"Mittel"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 440e364..6e8bbe4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Verbunden"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Verbunden (kein Telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Verbunden (außer Audiomedien)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Verbunden (außer Telefon- und Audiomedien)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Nicht verbunden"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbindung wird getrennt..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-Verbindungsanfrage"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Zum Herstellen einer Verbindung mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" berühren"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Möchten Sie eine Verbindung mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" herstellen?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonbuchanfrage"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s möchte auf Ihre Kontakte und Ihre Anrufliste zugreifen. Möchten Sie %2$s den Zugriff erlauben?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nicht mehr fragen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nicht mehr fragen"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Nachrichtenanfrage"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s möchte auf Ihre Nachrichten zugreifen. Möchten Sie %2$s den Zugriff erlauben?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp; Uhrzeit"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zeitzone wählen"</string>
@@ -480,6 +484,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Eingabegerät"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetzugriff"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Freigabe der Internetverbindung"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Medien-Audiosystem getrennt."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird von der Freisprechfunktion getrennt."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Eingabegerät getrennt."</string>
@@ -495,6 +501,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbunden mit  Audiosystem von Medien"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbunden mit Audiosystem des Telefons"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Mit Dateiübertragungsserver verbunden"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nicht mit Dateiübertragungsserver verbunden"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Mit einem Eingabegerät verbunden"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Für Internetzugriff an Gerät angeschlossen"</string>
@@ -504,6 +512,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Für Dateiübertragung verwenden"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Für Eingabe verwenden"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Für Internetzugriff verwenden"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dock-Einstellungen"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dock für Audio verwenden"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als Lautsprechertelefon"</string>
@@ -695,6 +705,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WLAN-Hotspot einrichten"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
@@ -1921,6 +1933,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Nutzer"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Nutzer &amp; Profile"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Nutzer oder Profil hinzufügen"</string>
@@ -1966,13 +1990,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Apps und Inhalte zulassen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps mit Einschränkungen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"App-Einstellungen erweitern"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Sprache ändern"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Schriftgröße ändern"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Zahlungen"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Jedes Mal fragen"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Als bevorzugte Einstellung festlegen?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Einschränkungen"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Einschränkungen aufheben"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN ändern"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1f9f3ab..1bd16b8 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Συνδεδεμένο"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Συνδεδεμένο (όχι τηλ.)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Συνδεδεμένο (όχι μέσα)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Συνδεδεμένο (χωρίς τηλέφωνο ή πολυμέσα)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Αποσυνδέθηκε"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Αποσύνδεση..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Αίτημα σύνδεσης Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Αγγίξτε για να συνδεθείτε στη συσκευή \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Θέλετε να συνδεθείτε στο \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\";"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Αίτημα τηλεφωνικού καταλόγου"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Το %1$s ζητά πρόσβαση στις επαφές και στο ιστορικό κλήσεών σας. Να εκχωρηθεί πρόσβαση στο %2$s;"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Να μην ερωτηθώ ξανά"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Να μην ερωτηθώ ξανά"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Αίτημα μηνύματος"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s επιθυμεί να αποκτήσει πρόσβαση στα μηνύματά σας. Παραχώρηση πρόσβασης σε %2$s;"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ρυθμίσεις ημερομηνίας &amp; ώρας"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Επιλέξτε ζώνη ώρας"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Συσκευή εισόδου"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Πρόσβαση στο Διαδίκτυο"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Κοινή χρήση σύνδεσης στο Διαδίκτυο"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τον ήχο μέσων."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τον ήχο handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τη συσκευή εισόδου."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Συνδέθηκε σε ήχο πολυμέσων"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Συνδεδεμένο στον ήχο τηλεφώνου"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Συνδεδεμένο σε διακομιστή μεταφοράς αρχείων"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Δεν έχει συνδεθεί σε διακομιστή μεταφοράς αρχείων"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Συνδέθηκε σε συσκευή εισόδου"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Συνδέθηκε με συσκευή με πρόσβ. στο Διαδ."</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Χρήση για τη μεταφορά αρχείων"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Χρήση για είσοδο"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Χρήση για την πρόσβαση στο Διαδίκτυο"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ρυθμίσεις βάσης σύνδεσης αυτοκινήτου"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Χρησιμοποιήστε τη βάση σύνδεσης αυτοκινήτου για αναπαραγωγή ήχου"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ως τηλέφωνο ανοιχτής συνομιλίας"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Ρύθμιση φορητού σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Φορητό σημείο πρόσβασης Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Απενεργοποιημένο"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Ανεκτικό"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Επιβολή"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Χρήστες"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Χρήστες και προφίλ"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Προσθήκη χρήστη ή προφίλ"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Να επιτρέπονται εφαρμογές και περιεχόμενο"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Εφαρμογές με περιορισμούς"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Επέκταση ρυθμίσεων για εφαρμ."</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Αυτή η χρήση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Αλλαγή γλώσσας"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Αλλαγή μεγέθους γραμματοσειράς"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Πληρωμές"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Ερώτηση κάθε φορά"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ορισμός ως προτίμησης;"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Ορισμός ως προτίμησης;"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Να χρησιμοποιείται πάντα η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> με τη λειτουργία \"πατήστε και πληρώστε\";"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Να χρησιμοποιείται πάντα η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> αντί για την εφαρμογή <xliff:g id="APP_1">%2$s</xliff:g> με τη λειτουργία \"πατήστε και πληρώστε\";"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Περιορισμοί"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Κατάργηση περιορισμών"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Αλλαγή κωδικού PIN"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b696d7d..e29c8a1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -133,6 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connected"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connected (no phone)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connected (no media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connected (no message access)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connected (no phone or media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnected"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnecting…"</string>
@@ -163,11 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Touch to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Phone book request"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Phone book access request"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wants to access your contacts and call history. Give access to %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Don\'t ask again"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Don\'t ask again"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Message request"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Message access request"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Date &amp; time settings"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
@@ -479,6 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Input device"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internet access"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from input device."</string>
@@ -494,6 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connected to map"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Not connected to file-transfer server"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connected to input device"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connected to device for Internet access"</string>
@@ -503,6 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Use for file transfer"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Use for input"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Use for Internet access"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Use for map"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dock Settings"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Use dock for audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
@@ -694,6 +698,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Set up Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portable Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
+    <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
@@ -1920,6 +1925,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Add user or profile"</string>
@@ -1965,13 +1982,16 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Uninstall this application"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"This setting affects all users on this tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Payments"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Ask every time"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Set as your preference?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Always use <xliff:g id="APP">%1$s</xliff:g> when you tap and pay?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Always use <xliff:g id="APP_0">%1$s</xliff:g> instead of <xliff:g id="APP_1">%2$s</xliff:g> when you tap and pay?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remove restrictions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
diff --git a/res/values-en-rIN-nokeys/strings.xml b/res/values-en-rIN-nokeys/strings.xml
new file mode 100644
index 0000000..05263e9
--- /dev/null
+++ b/res/values-en-rIN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Manage applications"</string>
+</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index b696d7d..e29c8a1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -133,6 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connected"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connected (no phone)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connected (no media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connected (no message access)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connected (no phone or media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnected"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnecting…"</string>
@@ -163,11 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Touch to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Phone book request"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Phone book access request"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wants to access your contacts and call history. Give access to %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Don\'t ask again"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Don\'t ask again"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Message request"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Message access request"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Date &amp; time settings"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
@@ -479,6 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Input device"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internet access"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from input device."</string>
@@ -494,6 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connected to map"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Not connected to file-transfer server"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connected to input device"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connected to device for Internet access"</string>
@@ -503,6 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Use for file transfer"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Use for input"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Use for Internet access"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Use for map"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dock Settings"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Use dock for audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
@@ -694,6 +698,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Set up Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portable Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
+    <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
@@ -1920,6 +1925,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Add user or profile"</string>
@@ -1965,13 +1982,16 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Uninstall this application"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"This setting affects all users on this tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Payments"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Ask every time"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Set as your preference?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Always use <xliff:g id="APP">%1$s</xliff:g> when you tap and pay?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Always use <xliff:g id="APP_0">%1$s</xliff:g> instead of <xliff:g id="APP_1">%2$s</xliff:g> when you tap and pay?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remove restrictions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 8860f3e..3530b9a 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"controlar ubicación"</item>
     <item msgid="5753382310468855812">"supervisar ubicación de alta potencia"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Ubicación"</item>
+    <item msgid="8677040780775113033">"Ubicación"</item>
+    <item msgid="1660743989948992916">"Ubicación"</item>
+    <item msgid="8791172739860195290">"Vibrar"</item>
+    <item msgid="383413555642128046">"Leer contactos"</item>
+    <item msgid="3654594895269697313">"Modificar contactos"</item>
+    <item msgid="7928393476362362538">"Leer registro de llamadas"</item>
+    <item msgid="6248591205254641116">"Modificar registro de llamadas"</item>
+    <item msgid="6093344633066170692">"Leer calendario"</item>
+    <item msgid="1334886368750347692">"Modificar calendario"</item>
+    <item msgid="1638204101698708656">"Ubicación"</item>
+    <item msgid="2154671955760380322">"Publicar notificación"</item>
+    <item msgid="4282477730595931828">"Ubicación"</item>
+    <item msgid="4891423912898525905">"Llamar a un teléfono"</item>
+    <item msgid="2623604824935968113">"Leer SMS o MMS"</item>
+    <item msgid="4420177125221176306">"Escribir SMS o MMS"</item>
+    <item msgid="3986142739951490025">"Recibir SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Recibir SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Recibir SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Recibir SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Enviar SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Leer SMS o MMS"</item>
+    <item msgid="4370895547001583812">"Escribir SMS o MMS"</item>
+    <item msgid="4218544235221631789">"Modificar configuración"</item>
+    <item msgid="736541391767350377">"Dibujar en la parte superior"</item>
+    <item msgid="5530815681721654194">"Acceder a las notificaciones"</item>
+    <item msgid="781213371706962767">"Cámara"</item>
+    <item msgid="1720492593061838172">"Grabar audio"</item>
+    <item msgid="3493046322001257041">"Reproducir audio"</item>
+    <item msgid="136815868796597058">"Leer portapapeles"</item>
+    <item msgid="5238692940326972503">"Modificar portapapeles"</item>
+    <item msgid="5753789168376302997">"Botones de medios"</item>
+    <item msgid="3265262911688671938">"Enfoque de audio"</item>
+    <item msgid="2098976479485046797">"Volumen principal"</item>
+    <item msgid="5660213838861789350">"Volumen de voz"</item>
+    <item msgid="7983336752371254444">"Volumen de tono"</item>
+    <item msgid="7878027809189330917">"Volumen de medios"</item>
+    <item msgid="7260546305036218513">"Volumen de alarma"</item>
+    <item msgid="9103719301075748925">"Volumen de notificación"</item>
+    <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantener en funcionamiento"</item>
+    <item msgid="8584357129746649222">"Ubicación"</item>
+    <item msgid="7669257279311110599">"Ubicación"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d5e21df..1c5b35f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin tel. ni audio multimedia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toca para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Deseas conectarte a “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitud de agenda telefónica"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s desea acceder a tus contactos y a tu historial de llamadas. ¿Deseas darle acceso a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"No volver a preguntar"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No volver a preguntar"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Solicitud de mensaje"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuración de fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio multimedia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio multimedia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del dispositivo"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado al servidor de transferencia de archivo"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No conectado al servidor de transferencia de archivo"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado a un dispositivo para acceder a Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para la transferencia de archivos"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acceso a Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuración de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizar la base para el audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar la zona Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi‑Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
@@ -1448,7 +1460,7 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> en la batería"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de uso de la batería"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> desde que se desconectó"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla encendida"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Agregar usuario o perfil"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. a aplicación"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de esta tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagos"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Preguntar siempre"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"¿Establecer como preferencia?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"NO TRADUCIR"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"¿Establecer como preferencia?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"¿Utilizar siempre <xliff:g id="APP">%1$s</xliff:g> al tocar y pagar?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"¿Utilizar siempre <xliff:g id="APP_0">%1$s</xliff:g> en lugar de <xliff:g id="APP_1">%2$s</xliff:g> al tocar y pagar?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c9c3e31..8b4714b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin teléfono ni multimedia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectada"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toca para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Quieres conectarte a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitud de agenda telefónica"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s quiere acceder a tus contactos y a tu historial de llamadas. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"No volver a preguntar"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No volver a preguntar"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Solicitud de mensaje"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ajustes de fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del perfil de audio A2DP."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio manos libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio del medio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado con el servidor de transferencia de archivos"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Sin conexión con el servidor de transferencia de archivos"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado para acceso a Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uso de la transferencia de archivos"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acceder a Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ajustes de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uso de la base para audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar zona Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi portátil de <xliff:g id="NETWORK_SSID">%1$s</xliff:g> de <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
@@ -1004,7 +1016,7 @@
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo sensores del dispositivo"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicacación desactivada"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes ubicación recientes"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de ubicación recientes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación ha solicitado la ubicación recientemente"</string>
     <string name="location_category_app_settings" msgid="46434611182743486">"Ajustes de aplicaciones"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso de batería elevado"</string>
@@ -1312,7 +1324,7 @@
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostrar siempre"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Ocultar siempre"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de entrada"</string>
-    <string name="input_method_settings" msgid="5801295625486269553">"Configuración"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Ajustes"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Ajustes"</string>
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos de entrada activos"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Usar idioma del sistema"</string>
@@ -1331,7 +1343,7 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opción en el menú de encendido para generar 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="bt_hci_snoop_log" msgid="3340699311158865670">"Habilitar registro de búsqueda de HCI de Bluetooth"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Registro de búsqueda de HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth HCI en un archivo"</string>
     <string name="select_runtime_title" msgid="649783802363155346">"Elegir tiempo de ejecución"</string>
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Elegir tiempo de ejecución"</string>
@@ -1448,7 +1460,7 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de batería"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> usando batería"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> desde que se cargó"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla encendida"</string>
@@ -1522,7 +1534,7 @@
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas técnicas sobre procesos en ejecución"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Estadísticas de <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="process_stats_memory_status" msgid="4251599550196193093">"Actualmente, la memoria del dispositivo está <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_memory_status" msgid="4251599550196193093">"Actualmente, la memoria del dispositivo es <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
     <string name="process_stats_ram_use" msgid="1271366870003042708">"Uso de RAM medio"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Duración"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
@@ -1639,7 +1651,7 @@
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cuando vuelvas a instalar una aplicación, restaurar la configuración y los datos incluidos en la copia"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña para copias de ordenador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Las copias de seguridad completas de ordenador no están protegidas"</string>
-    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocar para cambiar o eliminar la contraseña para copias de seguridad completas de ordenador"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocar para cambiar o eliminar la contraseña para las copias de seguridad completas de ordenador"</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nueva contraseña de seguridad establecida"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"La nueva contraseña y la de confirmación no coinciden."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Error al establecer contraseña de seguridad"</string>
@@ -1650,7 +1662,7 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradores de dispositivos"</string>
     <string name="no_device_admins" msgid="702695100241728775">"No hay ningún administrador de dispositivos disponible."</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"¿Quieres activar el administrador de dispositivos?"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"¿Activar administrador de dispositivos?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Activar"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador de dispositivos"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Al activar este administrador, la aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> podrá llevar a cabo las siguientes operaciones:"</string>
@@ -1910,8 +1922,8 @@
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"¿Quieres inhabilitar el certificado de CA del sistema?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"¿Quieres eliminar el certificado de CA de usuario de forma permanente?"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Corrector ortográfico"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introduce aquí la contraseña actual de copia de seguridad completa."</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduce una contraseña nueva para copias de seguridad completas."</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introduce aquí la contraseña actual de la copia de seguridad completa."</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduce una contraseña nueva para las copias de seguridad completas."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Vuelve a escribir aquí la nueva contraseña de copia de seguridad completa."</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Establecer contraseña"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Añadir usuario o perfil"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar ajustes de aplicación"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de este tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagos"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Preguntar siempre"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"¿Establecer como preferencia?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"NO TRADUCIR"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"¿Establecer como preferencia?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"¿Usar siempre <xliff:g id="APP">%1$s</xliff:g> al tocar y pagar?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"¿Usar siempre <xliff:g id="APP_0">%1$s</xliff:g> en lugar de <xliff:g id="APP_1">%2$s</xliff:g> al tocar y pagar?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
diff --git a/res/values-et-rEE-nokeys/strings.xml b/res/values-et-rEE-nokeys/strings.xml
new file mode 100644
index 0000000..39715f9
--- /dev/null
+++ b/res/values-et-rEE-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Rakenduste haldamine"</string>
+</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index caae2f6..3b398e9 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ühendatud"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ühendatud (telefoni pole)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ühendatud (meediat pole)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ühendatud (pole telefoni ega meediat)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ühendus katkestatud"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ühenduse katkestamine ..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-ühenduse taotlus"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Puudutage seadmega „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” ühendamiseks."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Kas soovite ühendada seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefoniraamatu taotlus"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s soovib juurdepääsu teie kontaktisikutele ja kõneajaloole. Kas lubate juurdepääsu kasutajale %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ära enam küsi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ära enam küsi"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Sõnumi taotlus"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s soovib saada juurdepääsu sõnumitele. Kas anda seadmele %2$s juurdepääs?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Kuupäeva ja kellaaja seaded"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ajavööndi valimine"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Sisendseade"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetti juurdepääs"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneti-ühenduse jagamine"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus meediumiheliga katkestatakse."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus vabakäeseadme heliga katkestatakse."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus sisendseadmega katkestatakse."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ühendatud meediumiheliga"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ühendatud telefoniheliga"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ühendatud failiedastuse serveriga"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ei ole failiedastuse serveriga ühendatud"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ühendatud sisendseade"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ühendatud seadmega Internetti juurdepääsuks"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Kasutage failide edastamiseks"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Kasutage sisendi jaoks"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Interneti-juurdepääsuks kasutamine"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Doki seaded"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Kasutage heli jaoks dokki"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kõlartelefonina"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WiFi-tugijaama seadistamine"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kaasaskantav WiFi-tugijaam"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Kuva"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Kasutajad"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Kasutajad ja profiilid"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Lisa kasutaja või profiil"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Rakenduste ja sisu lubamine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Piirangutega rakendused"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laienda rakenduste seadeid"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Seade mõjutab kõiki tahvelarvuti kasutajaid."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Seade mõjutab kõiki telefoni kasutajaid."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Muuda keelt"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Fondi suuruse muutmine"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Maksed"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Küsi iga kord"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Kas määrata eelistuseks?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Piirangud"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eemalda piirangud"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Muuda PIN-koodi"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 9314758..a4556cf 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"کنترل موقعیت مکانی"</item>
     <item msgid="5753382310468855812">"کنترل مکان پرقدرت"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"موقعیت مکانی"</item>
+    <item msgid="8677040780775113033">"موقعیت مکانی"</item>
+    <item msgid="1660743989948992916">"موقعیت مکانی"</item>
+    <item msgid="8791172739860195290">"لرزش"</item>
+    <item msgid="383413555642128046">"خواندن مخاطبین"</item>
+    <item msgid="3654594895269697313">"اصلاح مخاطبین"</item>
+    <item msgid="7928393476362362538">"خواندن گزارش تماس"</item>
+    <item msgid="6248591205254641116">"اصلاح گزارش تماس"</item>
+    <item msgid="6093344633066170692">"خواندن تقویم"</item>
+    <item msgid="1334886368750347692">"اصلاح تقویم"</item>
+    <item msgid="1638204101698708656">"موقعیت مکانی"</item>
+    <item msgid="2154671955760380322">"اعلان پست"</item>
+    <item msgid="4282477730595931828">"موقعیت مکانی"</item>
+    <item msgid="4891423912898525905">"تماس تلفنی"</item>
+    <item msgid="2623604824935968113">"‏خواندن پیامک/MMS"</item>
+    <item msgid="4420177125221176306">"‏نوشتن پیامک/MMS"</item>
+    <item msgid="3986142739951490025">"‏دریافت پیامک/MMS"</item>
+    <item msgid="3984213795861739778">"‏دریافت پیامک/MMS"</item>
+    <item msgid="3656243523752472788">"‏دریافت پیامک/MMS"</item>
+    <item msgid="8105802370238551510">"‏دریافت پیامک/MMS"</item>
+    <item msgid="1407766984645388488">"‏ارسال پیامک/MMS"</item>
+    <item msgid="3527273606643794973">"‏خواندن پیامک/MMS"</item>
+    <item msgid="4370895547001583812">"‏نوشتن پیامک/MMS"</item>
+    <item msgid="4218544235221631789">"تغییر تنظیمات"</item>
+    <item msgid="736541391767350377">"در بالا طراحی کنید"</item>
+    <item msgid="5530815681721654194">"اعلان‌های دسترسی"</item>
+    <item msgid="781213371706962767">"دوربین"</item>
+    <item msgid="1720492593061838172">"ضبط صدا"</item>
+    <item msgid="3493046322001257041">"پخش صدا"</item>
+    <item msgid="136815868796597058">"خواندن کلیپ بورد"</item>
+    <item msgid="5238692940326972503">"اصلاح کردن کلیپ بورد"</item>
+    <item msgid="5753789168376302997">"دکمه‌های رسانه‌"</item>
+    <item msgid="3265262911688671938">"فوکوس صدا"</item>
+    <item msgid="2098976479485046797">"میزان صدای اصلی"</item>
+    <item msgid="5660213838861789350">"میزان صدای مکالمه"</item>
+    <item msgid="7983336752371254444">"میزان صدای زنگ"</item>
+    <item msgid="7878027809189330917">"میزان صدای رسانه"</item>
+    <item msgid="7260546305036218513">"میزان صدای زنگ هشدار"</item>
+    <item msgid="9103719301075748925">"میزان صدای اعلان"</item>
+    <item msgid="7025966722295861512">"میزان صدای بلوتوث"</item>
+    <item msgid="4665183401128289653">"بیدار باش"</item>
+    <item msgid="8584357129746649222">"موقعیت مکانی"</item>
+    <item msgid="7669257279311110599">"مکان"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
     <item msgid="2560532955514699713">"متوسط"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 85167a7..fbd04d4 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل شد (بدون تلفن)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل شد (بدون رسانه)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل شد (بدون تلفن یا رسانه)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"اتصال قطع شد"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"در حال قطع اتصال..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"درخواست اتصال بلوتوث"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"برای اتصال به \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" لمس کنید."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"آیا می‌خواهید به \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" وصل شوید؟"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"درخواست دفترچه تلفن"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"‏%1$s می‌خواهد به مخاطبین و سابقه تماس شما دسترسی پیدا کند. اجازهٔ دسترسی به %2$s داده شود؟"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"دوباره سؤال نشود"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"دوباره سؤال نشود"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"درخواست پیام"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s می‌خواهد به پیام‌های شما دسترسی یابد. اجازه دسترسی به %2$s داده شود؟"</string>
     <string name="date_and_time" msgid="4114084177056654663">"تنظیمات تاریخ و ساعت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"انتخاب منطقهٔ زمانی"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"دستگاه ورودی"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"دسترسی به اینترنت"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"اشتراک‌گذاری اتصال اینترنت"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از صدای رسانه قطع می‌شود."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از صدای هندزفری قطع می‌شود."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از دستگاه ورودی قطع می‌شود."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"به رسانه صوتی متصل شد"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"به تلفن صوتی متصل شد"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"به سرور انتقال فایل متصل شد"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"به سرور انتقال فایل متصل نیست"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"به دستگاه ورودی متصل شد"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"برای دسترسی به اینترنت، به دستگاه متصل شد"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"استفاده برای انتقال فایل"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"استفاده برای چاپ"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"استفاده برای دسترسی به اینترنت"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"تنظیمات جایگاه"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"استفاده از جایگاه برای صدا"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"به‌عنوان تلفن دارای بلندگو"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"‏تنظیم نقطه اتصال Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"‏<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> نقطه اتصال قابل حمل Wi-Fi"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"صفحهٔ نمایش"</string>
     <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"غیرفعال"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"مجاز"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"در حال اعمال"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"کاربران"</string>
     <string name="user_list_title" msgid="7937158411137563543">"کاربران و نمایه‌ها"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"افزودن کاربر یا نمایه"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"اجازه به برنامه‌ها و محتوا"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"برنامه‌های دارای محدودیت"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسعه تنظیمات برای برنامه"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"این تنظیم روی همه کاربران موجود در این رایانه لوحی تأثیر می‌گذارد."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"این تنظیم روی همه کاربران موجود در این تلفن تأثیر می‌گذارد."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغییر زبان"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"تغییر اندازه قلم"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"پرداخت‏‌ها"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"هر بار پرسیده شود"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"به عنوان روش ترجیحی شما تنظیم شود؟"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"محدودیت‌ها"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"حذف محدودیت‌ها"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغییر پین"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e3d1087..c716307 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Yhdistetty"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Yhdistetty (ei puhelimen ääntä)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Yhdistetty (ei median ääntä)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Yhdistetty (ei puhelimen/median ääntä)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Yhteys katkaistu"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Katkaistaan yhteyttä..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-yhteyspyyntö"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Yhdistä laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koskettamalla."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Haluatko yhdistää laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Osoitekirjapyyntö"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s pyytää yhteystietojesi ja puheluhistoriasi käyttöoikeutta. Annetaanko käyttöoikeus (%2$s)?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Älä kysy uudestaan"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Älä kysy uudestaan"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Viestipyyntö"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s haluaa käyttää viestejäsi. Myönnetäänkö käyttöoikeus kohteeseen %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Päivämäärä- ja aika-asetukset"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Valitse aikavyöhyke"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Syöttölaite"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetyhteys"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetyhteyden jakaminen"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan median äänentoistosta."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan handsfree-äänentoistosta."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan syöttölaitteesta."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Yhdistetty median ääneen"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Yhdistetty puhelimen ääneen"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Yhdistetty tiedostonsiirtopalvelimeen"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ei yhdistetty tiedostonsiirtopalvelimeen"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Yhdistetty syöttölaitteeseen"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Yhdistetty laitteen internetyhteyteen"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Käytä tiedostojen siirtoon"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Käytä syöttöön"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Käytä internetyhteyteen"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Telakointiasetukset"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Käytä telakointia äänelle"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaiuttimena"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Luo wifi-hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kannettava wifi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Käyttäjät"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Käyttäjät ja profiilit"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Lisää käyttäjä tai profiili"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Sovellusten ja sisällön salliminen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Rajoitetut sovellukset"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laajenna sovelluksen asetuksia"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Tämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Vaihda kieltä"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Muuta kirjasinkokoa"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Maksut"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Kysy aina"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Valitaanko asetukseksi?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Rajoitukset"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Poista rajoitukset"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Vaihda PIN-koodi"</string>
diff --git a/res/values-fr-rCA-nokeys/strings.xml b/res/values-fr-rCA-nokeys/strings.xml
new file mode 100644
index 0000000..8b1d634
--- /dev/null
+++ b/res/values-fr-rCA-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Gérer applications"</string>
+</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 31c2a8b..47ebfbc 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connecté (sans audio pour appels tél.)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connecté (sans audio contenu mutimédia)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connecté (sans audio tel./multimédia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Déconnexion…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Demande de connexion Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Appuyez pour vous connecter à « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Voulez-vous vous connecter à « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Demande de répertoire"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s souhaite accéder à vos contacts et à l\'historique de vos appels. Autoriser l\'accès à %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ne plus me demander"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne plus me demander"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Demande d\'accès aux messages"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s souhaite accéder à vos messages. Autoriser l\'accès à %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Paramètres d\'heure et de date"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Périphérique d\'entrée"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accès Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté du périphérique d\'entrée"</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté à l\'audio du support"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté à l\'audio du téléphone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connecté au périphérique d\'entrée"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connecté à l\'appareil pour accès Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utiliser comme entrée"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utiliser pour l\'accès à Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Paramètres station d’accueil"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utiliser la station d’accueil pour l\'audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurer le point d\'accès Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"DISPLAY"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
@@ -1922,6 +1934,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Ajouter un utilisateur ou un profil"</string>
@@ -1967,13 +1991,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Paiements"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Toujours demander"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Définir comme préférence?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Définir comme application de paiement par défaut?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Toujours utiliser <xliff:g id="APP">%1$s</xliff:g> pour les achats tap-and-pay?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Toujours utiliser <xliff:g id="APP_0">%1$s</xliff:g> au lieu de <xliff:g id="APP_1">%2$s</xliff:g> pour les achats tap-and-pay?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Annuler les restrictions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Modifier le NIP"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6e95eb0..90b7e60 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connecté (sans audio pour appels tél.)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connecté (sans audio contenu mutimédia)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connecté (sans audio tel./multimédia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Déconnexion…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Demande de connexion Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Appuyez pour vous connecter à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Voulez-vous vous connecter à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Demande de répertoire"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s souhaite accéder à vos contacts et à l\'historique de vos appels. Autoriser l\'accès à %2$s ?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ne plus me demander"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne plus me demander"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Demande d\'accès aux messages"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Une demande d\'accès à vos messages a été envoyée pour \"%1$s\". Accorder l\'accès à \"%2$s\" ?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Paramètres d\'heure et de date"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Périphérique d\'entrée"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accès Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté du périphérique d\'entrée."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté aux paramètres audio du téléphone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connecté au périphérique d\'entrée"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connecté à l\'appareil pour accès Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utiliser comme entrée"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utiliser pour l\'accès à Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Paramètres de la station d\'accueil"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utiliser station d\'accueil pour l\'audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurer le point d\'accès Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
@@ -1326,11 +1338,11 @@
     <string name="development_settings_not_available" msgid="4308569041701535607">"Les options proposées aux développeurs ne sont pas disponibles pour cet utilisateur."</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="clear_adb_keys" msgid="4038889221503122743">"Annuler les autorisations relatives au débogage USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Rapports de bug du menu de démarrage"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Annuler autorisations pour débog. USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Rapports de bug menu démarra."</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="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement."</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer les journaux par espionnage HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Enregistrer tous les paquets HCI Bluetooth dans un fichier"</string>
     <string name="select_runtime_title" msgid="649783802363155346">"Sélect. moteur d\'exécution"</string>
@@ -1922,6 +1934,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Utilisateurs"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Ajouter un utilisateur ou un profil"</string>
@@ -1967,13 +1991,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Paiements"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Toujours demander"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Définir en tant que mode de paiement prioritaire ?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Annuler les restrictions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Modifier le code PIN"</string>
diff --git a/res/values-hi-nokeys/strings.xml b/res/values-hi-nokeys/strings.xml
index ddf9521..6ea8e99 100644
--- a/res/values-hi-nokeys/strings.xml
+++ b/res/values-hi-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-hi/arrays.xml b/res/values-hi/arrays.xml
index 5809ff0..18099b5 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -148,7 +148,7 @@
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"कमज़ोर"</item>
     <item msgid="5615082285463430971">"उपयुक्त"</item>
-    <item msgid="3565079809875324621">"अच्छा"</item>
+    <item msgid="3565079809875324621">"अच्छी"</item>
     <item msgid="5702329417707689835">"उत्कृष्ट"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
@@ -169,7 +169,7 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"उपयोग समय"</item>
     <item msgid="3703676222230317933">"लॉन्च की संख्या"</item>
-    <item msgid="2502754479975776899">"एप्‍लिकेशन का नाम"</item>
+    <item msgid="2502754479975776899">"एप्‍स का नाम"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"मॉनिटर का स्थान"</item>
     <item msgid="5753382310468855812">"उच्च पावर वाले स्थान की निगरानी करें"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"स्थान"</item>
+    <item msgid="8677040780775113033">"स्थान"</item>
+    <item msgid="1660743989948992916">"स्थान"</item>
+    <item msgid="8791172739860195290">"कंपन"</item>
+    <item msgid="383413555642128046">"संपर्क पढ़ें"</item>
+    <item msgid="3654594895269697313">"संपर्कों को बदलें"</item>
+    <item msgid="7928393476362362538">"कॉल लॉग पढ़ें"</item>
+    <item msgid="6248591205254641116">"कॉल लॉग बदलें"</item>
+    <item msgid="6093344633066170692">"कैलेंडर पढ़ें"</item>
+    <item msgid="1334886368750347692">"कैलेंडर बदलें"</item>
+    <item msgid="1638204101698708656">"स्थान"</item>
+    <item msgid="2154671955760380322">"सूचना पोस्ट करें"</item>
+    <item msgid="4282477730595931828">"स्थान"</item>
+    <item msgid="4891423912898525905">"फ़ोन पर कॉल करें"</item>
+    <item msgid="2623604824935968113">"SMS/MMS पढ़ें"</item>
+    <item msgid="4420177125221176306">"SMS/MMS लिखें"</item>
+    <item msgid="3986142739951490025">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="3984213795861739778">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="3656243523752472788">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="8105802370238551510">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="1407766984645388488">"SMS/MMS भेजें"</item>
+    <item msgid="3527273606643794973">"SMS/MMS पढ़ें"</item>
+    <item msgid="4370895547001583812">"SMS/MMS लिखें"</item>
+    <item msgid="4218544235221631789">"सेटिंग बदलें"</item>
+    <item msgid="736541391767350377">"ऊपर बनाएं"</item>
+    <item msgid="5530815681721654194">"सूचनाओं को एक्सेस करें"</item>
+    <item msgid="781213371706962767">"कैमरा"</item>
+    <item msgid="1720492593061838172">"ऑडियो रिकॉर्ड करें"</item>
+    <item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
+    <item msgid="136815868796597058">"क्लिपबोर्ड पढ़ें"</item>
+    <item msgid="5238692940326972503">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="5753789168376302997">"मीडिया बटन"</item>
+    <item msgid="3265262911688671938">"ऑडियो फ़ोकस"</item>
+    <item msgid="2098976479485046797">"मास्टर आवाज़"</item>
+    <item msgid="5660213838861789350">"ध्वनि आवाज़"</item>
+    <item msgid="7983336752371254444">"रिंग आवाज़"</item>
+    <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="7260546305036218513">"अलार्म आवाज़"</item>
+    <item msgid="9103719301075748925">"सूचना वॉल्‍यूम"</item>
+    <item msgid="7025966722295861512">"Bluetooth वॉल्‍यूम"</item>
+    <item msgid="4665183401128289653">"सचेत रखें"</item>
+    <item msgid="8584357129746649222">"स्थान"</item>
+    <item msgid="7669257279311110599">"स्थान"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
     <item msgid="2560532955514699713">"मध्यम"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 77f0ccd..8a83a0b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"कनेक्ट किया गया"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"कनेक्‍ट है (फ़ोन नहीं)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"कनेक्‍ट है (मीडि‍या नहीं)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"कनेक्‍ट है (फ़ोन या मीडि‍या नहीं)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"डिस्कनेक्‍ट किया गया"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"डिस्‍कनेक्‍ट हो रहा है..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth कनेक्शन अनुरोध"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करने के लिए स्पर्श करें."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"क्या आप \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करना चाहते हैं?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"फ़ोन बुक अनुरोध"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s आपके संपर्कों और कॉल इतिहास में पहुंच प्राप्त करना चाहता है. %2$s पर पहुंच दें?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"फिर से न पूछें"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"फिर से न पूछें"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"संदेश का अनुरोध"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s आपके संदेशों को एक्सेस करना चाहता है. %2$s पर एक्सेस दें?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"दिनांक और समय सेटिंग"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चुनें"</string>
@@ -197,7 +201,7 @@
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"आपको पोर्ट फ़ील्‍ड पूर्ण करना होगा."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"यदि होस्‍ट फ़ील्‍ड रिक्त है तो पोर्ट फ़ील्‍ड को रिक्त होना ही चाहिए."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"आपके द्वारा लिखा गया पोर्ट मान्‍य नहीं है."</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य एप्‍लिकेशन द्वारा उपयोग नहीं किया जा सकता."</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य एप्‍स द्वारा उपयोग नहीं किया जा सकता."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"स्थान:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"समीपस्‍थ CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"सेल जानकारी:"</string>
@@ -311,7 +315,7 @@
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"विजेट सक्षम करें"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"व्यवस्थापक के द्वारा अक्षम किया गया"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
-    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"लॉक स्‍क्रीन पर प्रदर्शित करने के लिए पाठ लिखें"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"लॉक स्‍क्रीन पर दिखाई देने के लिए पाठ लिखें"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"लॉक स्क्रीन पर उपयोगकर्ता जानकारी दिखाएं"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"उपयोगकर्ता जानकारी"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"लॉक स्क्रीन पर प्रोफ़ाइल की जानकारी दिखाएं"</string>
@@ -337,7 +341,7 @@
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"एन्‍क्रिप्‍शन प्रारंभ करने से पहले आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एन्‍क्रिप्‍ट करें?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"एन्‍क्रिप्शन कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान टेबलेट कई बार पुन: प्रारंभ होगा."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"एन्‍क्रिप्शन कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान फ़ोन कई बार पुन: प्रारंभ होगा."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"सुरक्षित करने का कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान फ़ोन कई बार पुन: प्रारंभ होगा."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"एन्‍क्रिप्‍ट करना"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"अपना टेबलेट एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"अपना फ़ोन एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
@@ -348,7 +352,7 @@
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. \n\nअपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धति‍ स्विच करें"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्‍क्रीन लॉक चुनें"</string>
-    <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"बैकअप लॉक चुनें"</string>
+    <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"सुरक्षित लॉक चुनें"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"लॉक स्‍क्रीन बदलें"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"आकार, पिन या पासवर्ड सुरक्षा बदलें या अक्षम करें"</string>
@@ -469,7 +473,7 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"अयुग्‍मित करें"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"डिस्‍कनेक्‍ट करें और अयुग्‍मित करें"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"विकल्प…"</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"उन्नत"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"अतिरिक्त सेटिंग"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"उन्नत Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"उपकरणों को देखने के लिए, Bluetooth को चालू करें."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"इससे कनेक्‍ट करें…"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"इनपुट उपकरण"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"इंटरनेट पहुंच"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इंटरनेट कनेक्शन साझाकरण"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को मीडिया ऑडियो से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को हैंड्सफ़्री ऑडियो से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"इनपुट उपकरण से <xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"मीडिया ऑडियो से कनेक्‍ट किया गया"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फ़ोन ऑडियो से कनेक्‍ट किया गया"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फ़ाइल स्‍थानांतरण सर्वर से कनेक्‍ट किया गया"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"फ़ाइल स्‍थानांतरण सर्वर से कनेक्‍ट नहीं किया गया"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"इनपुट उपकरण से कनेक्‍ट किया गया"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"इंटरनेट पहुंच के लिए उपकरण से कनेक्‍ट"</string>
@@ -503,13 +511,15 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"फ़ाइल स्‍थानांतरण के लिए उपयोग करें"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"इनपुट के लिए उपयोग करें"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"इंटरनेट पहुंच के लिए उपयोग करें"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"डॉक सेटिंग"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ऑडियो के लिए डॉक का उपयोग करें"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्‍पीकर फ़ोन के रूप में"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत और मीडिया के लिए"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"वायरलेस प्रदर्शन"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"उपकरणों को देखने के लिए, वायरलेस प्रदर्शन चालू करें."</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Wifi दिखाई देने के लिए सेटिंग"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"उपकरणों को देखने के लिए, वायरलेस का दिखाई देना चालू करें."</string>
     <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"वायरलेस नही दिख रहा है क्योंकि Wi-Fi बंद है."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"प्रदर्शनों के लिए खोजें"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"खोज रहा है…"</string>
@@ -520,10 +530,10 @@
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट किया गया"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"उपलब्ध"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"उपयोग में"</string>
-    <string name="wifi_display_details" msgid="7791118209992162698">"प्रदर्शन सेटिंग"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Wifi के लिए सेटिंग"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"डिस्‍कनेक्‍ट करें?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"इससे &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; के साथ आपका कनेक्शन समाप्त हो जाएगा"</string>
-    <string name="wifi_display_options_title" msgid="5740656401635054838">"वायरलेस प्रदर्शन के विकल्प"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Wifi दिखाई देने के लिए के विकल्प"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"भूलें"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"पूर्ण"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"नाम"</string>
@@ -549,7 +559,7 @@
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"जब यह सुविधा चालू हो, तो आप एप्स सामग्री को किसी अन्‍य NFC-सक्षम उपकरण पर दोनों उपकरणों को पास-पास रख कर बीम कर सकते हैं. उदाहरण के लिए, आप ब्राउज़र पृष्ठ, YouTube वीडियो, लोग संपर्क, इत्‍यादि बहुत कुछ बीम कर सकते हैं.\n\nबस दोनों उपकरणों को साथ लाएं (आमतौर पर एक के पीछे एक) और फिर अपनी स्‍क्रीन को स्‍पर्श करें. एप्स पता लगा लेता है कि क्‍या बीम हुआ."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"नेटवर्क सेवा खोज"</string>
-    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"अन्‍य उपकरणों पर एप्‍लिकेशन को इस उपकरण पर एप्‍लिकेशन खोजने दें"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"अन्‍य उपकरणों पर एप्‍स को इस उपकरण पर एप्‍स खोजने दें"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi चालू करें"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -583,7 +593,7 @@
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi प्रत्यक्ष"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"उन्नत"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"अतिरिक्त सेटिंग"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्क से कनेक्‍ट करें"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"नेटवर्क भूलें"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क बदलें"</string>
@@ -597,7 +607,7 @@
     <string name="wifi_show_advanced" msgid="1793703023711426246">"उन्नत विकल्प दिखाएं"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi सुरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"अपने राउटर पर Wi-Fi सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिह्न हो सकता है:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"अपने राउटर पर Wi-Fi सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिन्ह हो सकता है:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"अपने 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="7153432445748931183">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट है"</string>
@@ -653,7 +663,7 @@
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"चेतावनी: जब तक आपके पास इंटरनेट कनेक्शन न हो, तब तक फ़ोन सत्यापित नहीं कर पाएगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टेबलेट इस Wi-Fi नेटवर्क से कनेक्ट नहीं हो सका था."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"फ़ोन इस Wi-Fi नेटवर्क से कनेक्ट नहीं हो सका था."</string>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"उन्‍नत Wi-Fi"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"अतिरिक्त सेटिंग"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi फ़्रीक्वेंसी बैंड"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"संचालन की फ़्रीक्‍वेंसी रेंज निर्दिष्ट करें"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"फ़्रीक्‍वेंसी बैंड सेट करने में समस्‍या थी."</string>
@@ -694,7 +704,9 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi हॉटस्‍पॉट सेट करें"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> पोर्टेबल Wi-Fi हॉटस्‍पॉट"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"दिखाएं"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
+    <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
@@ -745,14 +757,14 @@
     <string name="account_settings" msgid="6403589284618783461">"खाते"</string>
     <string name="search_settings" msgid="1910951467596035063">"खोज"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"खोज सेटिंग और इतिहास प्रबंधित करें"</string>
-    <string name="display_settings" msgid="7965901687241669598">"प्रदर्शन"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन स्‍वत: घुमाएं"</string>
+    <string name="display_settings" msgid="7965901687241669598">"स्क्रीन सेटिंग"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन अपनेआप घुमाएं"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"टेबलेट घुमाने पर स्‍वचालित रूप से अभिविन्‍यास स्‍विच करें"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"फ़ोन घुमाने पर अभिविन्‍यास स्‍वचालित रूप से स्‍विच करें"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"टेबलेट घुमाने पर स्‍वचालित रूप से अभिविन्‍यास स्‍विच करें"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"फ़ोन घुमाने पर अभिविन्‍यास स्‍वचालित रूप से स्‍विच करें"</string>
-    <string name="brightness" msgid="2354961343555249270">"चमक"</string>
-    <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की चमक एडजस्ट करें"</string>
+    <string name="brightness" msgid="2354961343555249270">"स्क्रीन की रोशनी"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की रोशनी एडजस्ट करें"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"प्रयोग में नहीं"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
@@ -767,7 +779,7 @@
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"daydream कब करें"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"अब प्रारंभ करें"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग"</string>
-    <string name="automatic_brightness" msgid="5014143533884135461">"स्‍वचालित चमक"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"अपनेआप"</string>
     <string name="title_font_size" msgid="4405544325522105222">"अक्षरों का आकार"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"अक्षरों का आकार"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग"</string>
@@ -784,7 +796,7 @@
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"सिम कार्ड अनलॉक करें"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"पुरानी सिम पिन"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"नया सिम पिन"</string>
-    <string name="sim_reenter_new" msgid="3178510434642201544">"नया पिन पुन: लिखें"</string>
+    <string name="sim_reenter_new" msgid="3178510434642201544">"नया पिन फिर से लिखें"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"सिम पिन"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"गलत पिन"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"पिनों का मिलान नहीं होता"</string>
@@ -866,8 +878,8 @@
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP या PTP प्रकार्य सक्रिय है"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB संग्रहण अनमाउंट करें?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD कार्ड को अनमाउंट करें?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"यदि आप USB संग्रहण को अनमाउंट करते हैं, तो आपके द्वारा उपयोग किए जा रहे कुछ एप्‍लिकेशन बंद हो जाएंगे और जब तक आप USB संग्रहण को पुन: माउंट नहीं करते, तब तक अनुपलब्‍ध रह सकते हैं."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"यदि आप SD कार्ड अनमाउंट करते हैं, तो आपके द्वारा उपयोग किए जा रहे कुछ एप्‍लिकेशन बंद हो जाएंगे और जब तक आप SD कार्ड को पुन: माउंट नहीं करते, तब तक अनुपलब्‍ध रह सकते हैं."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"यदि आप USB संग्रहण को अनमाउंट करते हैं, तो आपके द्वारा उपयोग किए जा रहे कुछ एप्‍स बंद हो जाएंगे और जब तक आप USB संग्रहण को पुन: माउंट नहीं करते, तब तक अनुपलब्‍ध रह सकते हैं."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"यदि आप SD कार्ड अनमाउंट करते हैं, तो आपके द्वारा उपयोग किए जा रहे कुछ एप्‍स बंद हो जाएंगे और जब तक आप SD कार्ड को पुन: माउंट नहीं करते, तब तक अनुपलब्‍ध रह सकते हैं."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"USB संग्रहण को अनमाउंट नहीं किया जा सका. बाद में पुन: प्रयास करें."</string>
@@ -933,8 +945,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"फ़ैक्टरी डेटा रीसेट"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"टेबलेट से सभी डेटा मिटाएं"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"फ़ोन से सभी डेटा मिटाएं"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"मोबाइल संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍लिकेशन"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"मोबाइल संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍लिकेशन"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"मोबाइल संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍स"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"मोबाइल संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में प्रवेश हैं:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्‍य उपयोगकर्ता डेटा"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB संग्रहण"</b>" मिटाना होगा."</string>
@@ -945,7 +957,7 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्ड पर मौजूद सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टेबलेट रीसेट करें"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फ़ोन रीसेट करें"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"आपकी सभी निजी जानकारी और डाउनलोड किए गए एप्‍लिकेशन मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"आपकी सभी निजी जानकारी और डाउनलोड किए गए एप्‍स मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"अपना अनलॉक आकार आरेखित करें"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपको फ़ैक्टरी डेटा रीसेट की पुष्टि करने के लिए अपना अनलॉक आकार बनाना होगा."</string>
@@ -1006,12 +1018,12 @@
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बंद"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल ही के स्थान अनुरोध"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी एप्स ने हाल ही में स्थान का अनुरोध नहीं किया है"</string>
-    <string name="location_category_app_settings" msgid="46434611182743486">"एप्‍लिकेशन सेटिंग"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"एप्‍स सेटिंग"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"अधिक बैटरी उपयोग"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"कम बैटरी उपयोग"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"स्थान के अनुमान हेतु GPS, Wi-Fi व मो. नेटवर्क उपयोग करें"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"स्थान के अनुमान हेतु Wi-Fi व मो. नेटवर्क उपयोग करें"</string>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"स्थान के अनुमान हेतु GPS, Wi-Fi व मोबाइल नेटवर्क का उपयोग करें"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"स्थान के अनुमान हेतु Wi-Fi व मोबाइल नेटवर्क का उपयोग करें"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"अपना स्थान बताने हेतु GPS उपयोग करें"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"पुनर्प्राप्त किया जा रहा है…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi और मोबाइल नेटवर्क स्थान"</string>
@@ -1085,19 +1097,19 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"आपके फ़ोन पर एप्स इंस्टॉल नहीं है."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"एप्स प्रबंधित करें"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्‍टॉल किए गए एप्‍लिकेशन प्रबंधित करें और निकालें"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्‍टॉल किए गए एप्‍स प्रबंधित करें और निकालें"</string>
     <string name="applications_settings" msgid="1721442176406964682">"एप्स"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"एप्‍लिकेशन प्रबंधित करें, त्‍वरित लॉन्‍च शॉर्टकट सेट करें"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"एप्‍लिकेशन सेटिंग"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"एप्‍स प्रबंधित करें, त्‍वरित लॉन्‍च शॉर्टकट सेट करें"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"एप्‍स सेटिंग"</string>
     <string name="install_applications" msgid="4872012136210802181">"अज्ञात स्रोत"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"अज्ञात स्रोतों से एप्स इंस्टॉल करने दें"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"आपका टेबलेट एवं निजी डेटा अज्ञात स्रोतों के एप्‍लिकेशन के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन एप्‍लिकेशन के उपयोग परिणामस्वरूप आपके टेबलेट को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"आपका फ़ोन एवं निजी डेटा अज्ञात स्रोतों के एप्‍लिकेशन के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन एप्‍लिकेशन के उपयोग परिणामस्वरूप आपके फ़ोन को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"आपका टेबलेट एवं निजी डेटा अज्ञात स्रोतों के एप्‍स के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन एप्‍स के उपयोग परिणामस्वरूप आपके टेबलेट को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"आपका फ़ोन एवं निजी डेटा अज्ञात स्रोतों के एप्‍स के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन एप्‍स के उपयोग परिणामस्वरूप आपके फ़ोन को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
     <string name="verify_applications" msgid="2959359554974828518">"एप्स सत्यापित करें"</string>
     <string name="verify_applications_summary" msgid="6737505521913263792">"हानि पहुंचा सकने वाले एप्स का इंस्टॉलेशन अस्वीकार करें या पहले चेतावनी दें"</string>
-    <string name="advanced_settings" msgid="1777249286757067969">"उन्नत सेटिंग"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"अतिरिक्त सेटिंग"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"अधिक सेटिंग विकल्‍प सक्षम करें"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"एप्‍लिकेशन जानकारी"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"एप्‍स जानकारी"</string>
     <string name="storage_label" msgid="8700867073480107253">"संग्रहण"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"डिफ़ॉल्‍ट रूप से लॉन्‍च करें"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"डिफ़ॉल्‍ट"</string>
@@ -1109,7 +1121,7 @@
     <string name="controls_label" msgid="7611113077086853799">"नियंत्रण"</string>
     <string name="force_stop" msgid="7435006169872876756">"बंद करना बाध्‍य करें"</string>
     <string name="total_size_label" msgid="1048676419552557254">"कुल"</string>
-    <string name="application_size_label" msgid="8494609207373874267">"एप्‍लिकेशन"</string>
+    <string name="application_size_label" msgid="8494609207373874267">"एप्‍स"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB संग्रहण एप्स"</string>
     <string name="data_size_label" msgid="8679376373625710107">"डेटा"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB संग्रहण डेटा"</string>
@@ -1121,13 +1133,13 @@
     <string name="enable_text" msgid="9217362512327828987">"सक्षम करें"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"डेटा साफ़ करें"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"नई जानकारी हटाएं"</string>
-    <string name="auto_launch_enable_text" msgid="2652825923953591251">"आपने कुछ क्रियाओं के लिए इस एप्‍लिकेशन को डिफ़ॉल्‍ट रूप से लॉन्‍च करना चुना है."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"आपने इस एप्‍लिकेशन को विजेट बनाने और उनके डेटा पर पहुंचने की अनुमति देना चुना है."</string>
+    <string name="auto_launch_enable_text" msgid="2652825923953591251">"आपने कुछ क्रियाओं के लिए इस एप्‍स को डिफ़ॉल्‍ट रूप से लॉन्‍च करना चुना है."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"आपने इस एप्‍स को विजेट बनाने और उनके डेटा पर पहुंचने की अनुमति देना चुना है."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"कोई डिफ़ॉल्‍ट सेट नहीं है."</string>
     <string name="clear_activities" msgid="7408923511535174430">"डिफ़ॉल्‍ट साफ़ करें"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"इस एप्स को संभवत: आपकी स्क्रीन के लिए डिज़ाइन नहीं किया गया है. आप यहां अपनी स्‍क्रीन को इसके द्वारा समायोजित किए जाने के तरीके को नियंत्रित कर सकते हैं."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"लॉन्‍च होने पर पूछें"</string>
-    <string name="enable_compatibility" msgid="5806819252068617811">"एप्‍लिकेशन स्‍केल करें"</string>
+    <string name="enable_compatibility" msgid="5806819252068617811">"एप्‍स स्‍केल करें"</string>
     <string name="unknown" msgid="1592123443519355854">"अज्ञात"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"नाम के अनुसार क्रमित करें"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"आकार के अनुसार क्रमित करें"</string>
@@ -1148,26 +1160,26 @@
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्ड पर"</string>
     <string name="disabled" msgid="9206776641295849915">"अक्षम किया गया"</string>
     <string name="not_installed" msgid="1475144352069281880">"इंस्‍टॉल नहीं है"</string>
-    <string name="no_applications" msgid="7336588977497084921">"कोई एप्‍लिकेशन नहीं."</string>
+    <string name="no_applications" msgid="7336588977497084921">"कोई एप्‍स नहीं."</string>
     <string name="internal_storage" msgid="1584700623164275282">"मोबाइल संग्रहण"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB संग्रहण"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD कार्ड संग्रहण"</string>
     <string name="recompute_size" msgid="7722567982831691718">"आकार पुन: परिकलित कर रहा है…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"एप्‍लिकेशन डेटा हटाएं?"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"इस एप्‍लिकेशन का सभी डेटा स्‍थायी रूप से हटा दिया जाएगा. इसमें सभी फ़ाइलें, सेटिंग, खाते, डेटाबेस आदि शामिल हैं."</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"एप्‍स डेटा हटाएं?"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"इस एप्‍स का सभी डेटा स्‍थायी रूप से हटा दिया जाएगा. इसमें सभी फ़ाइलें, सेटिंग, खाते, डेटाबेस आदि शामिल हैं."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ठीक है"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"रद्द करें"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
-    <string name="app_not_found_dlg_text" msgid="8333723538280257243">"इंस्‍टॉल किए गए एप्‍लिकेशन की सूची में एप्‍लिकेशन नहीं मिला."</string>
-    <string name="clear_data_failed" msgid="1907582169616856698">"एप्‍लिकेशन डेटा साफ़ नहीं कर सका."</string>
+    <string name="app_not_found_dlg_text" msgid="8333723538280257243">"इंस्‍टॉल किए गए एप्‍स की सूची में एप्‍स नहीं मिला."</string>
+    <string name="clear_data_failed" msgid="1907582169616856698">"एप्‍स डेटा साफ़ नहीं कर सका."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"नई जानकारी हटाएं?"</string>
-    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"इस Android सिस्‍टम एप्‍लिकेशन के सभी नई जानकारी हटा दिया जाएगा."</string>
+    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"इस Android सिस्‍टम एप्‍स के सभी नई जानकारी हटा दिया जाएगा."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"डेटा साफ़ करें"</string>
-    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"एप्‍लिकेशन के लिए डेटा साफ़ नहीं कर सका."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यह एप्‍लिकेशन आपके टेबलेट पर निम्‍न में पहुंच सकता है:"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"यह एप्‍लिकेशन आपके फ़ोन पर निम्‍न पर पहुंच सकता है:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"यह एप्‍लिकेशन आपके टेबलेट पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"यह एप्‍लिकेशन आपके फ़ोन पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
+    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"एप्‍स के लिए डेटा साफ़ नहीं कर सका."</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यह एप्‍स आपके टेबलेट पर निम्‍न में पहुंच सकता है:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"यह एप्‍स आपके फ़ोन पर निम्‍न पर पहुंच सकता है:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"यह एप्‍स आपके टेबलेट पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"यह एप्‍स आपके फ़ोन पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> और <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> और <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
@@ -1176,7 +1188,7 @@
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रीमियम SMS भेजें?"</string>
     <string name="computing_size" msgid="1599186977475211186">"गणना कर रहा है…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"पैकेज आकार की गणना नहीं की जा सकी."</string>
-    <string name="empty_list_msg" msgid="5993162337235907160">"आपके पास कोई भी तृतीय-पक्ष एप्‍लिकेशन इंस्‍टॉल नहीं है."</string>
+    <string name="empty_list_msg" msgid="5993162337235907160">"आपके पास कोई भी तृतीय-पक्ष एप्‍स इंस्‍टॉल नहीं है."</string>
     <string name="version_text" msgid="9189073826278676425">"संस्‍करण <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"ले जाएं"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"टेबलेट पर ले जाएं"</string>
@@ -1185,33 +1197,33 @@
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD कार्ड में ले जाएं"</string>
     <string name="moving" msgid="6431016143218876491">"ले जा रहा है"</string>
     <string name="insufficient_storage" msgid="481763122991093080">"पर्याप्त संग्रहण स्‍थान नहीं."</string>
-    <string name="does_not_exist" msgid="3476487214886606748">"एप्‍लिकेशन मौजूद नहीं है."</string>
-    <string name="app_forward_locked" msgid="6331564656683790866">"एप्‍लिकेशन की प्रति नहीं बनाई जा सकती."</string>
+    <string name="does_not_exist" msgid="3476487214886606748">"एप्‍स मौजूद नहीं है."</string>
+    <string name="app_forward_locked" msgid="6331564656683790866">"एप्‍स की प्रति नहीं बनाई जा सकती."</string>
     <string name="invalid_location" msgid="2786030127356312746">"इंस्‍टॉल स्‍थान मान्‍य नहीं है."</string>
     <string name="system_package" msgid="6222593098063037137">"सिस्‍टम के बारे में नई जानकारी बाहरी मीडिया से नहीं हटाया जा सकता."</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"बलपूर्वक बंद करें?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"यदि आप किसी एप्‍लिकेशन को बलपूर्वक रोकते हैं, तो यह गलत व्यवहार कर सकता है."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"यदि आप किसी एप्‍स को बलपूर्वक रोकते हैं, तो यह गलत व्यवहार कर सकता है."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"एप्स नहीं ले जाया जा सका. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"पसंदीदा इंस्‍टॉल स्‍थान"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"नए एप्‍लिकेशन के लिए पसंदीदा इंस्‍टॉलेशन स्‍थान बदलें"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"नए एप्‍स के लिए पसंदीदा इंस्‍टॉलेशन स्‍थान बदलें"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"अंतर्निहित एप्लि. अक्षम करें?"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"यदि आप कोई अंतर्निहित एप्‍लिकेशन अक्षम करते हैं, तो अन्‍य एप्‍लिकेशन गलत व्यवहार कर सकते हैं."</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"यदि आप कोई अंतर्निहित एप्‍स अक्षम करते हैं, तो अन्‍य एप्‍स गलत व्यवहार कर सकते हैं."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा हटाएं और एप्स को अक्षम करें?"</string>
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"यदि आप किसी अंतर्निहित एप्स को अक्षम करते हैं, तो अन्य एप्स का व्यवहार गड़बड़ा सकता है. आपका डेटा भी हटा दिया जाएगा."</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="app_ops_settings" msgid="5108481883575527511">"एप्स संचालन"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"चल रहा है"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(कभी उपयोग नहीं किया)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"संग्रहण उपयोग"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"एप्‍लिकेशन द्वारा उपयोग किया गया संग्रहण देखें"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"एप्‍स द्वारा उपयोग किया गया संग्रहण देखें"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"चल रही सेवाएं"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"वर्तमान में चल रही सेवाओं को देखें और नियंत्रित करें"</string>
     <string name="service_restarting" msgid="2242747937372354306">"पुन: प्रारंभ कर रहा है"</string>
     <string name="cached" msgid="1059590879740175019">"कैश की गई पृष्ठभूमि प्रक्रिया"</string>
     <string name="no_running_services" msgid="2059536495597645347">"कुछ नहीं चल रहा है."</string>
-    <string name="service_started_by_app" msgid="818675099014723551">"एप्‍लिकेशन द्वारा प्रारंभ किया गया."</string>
+    <string name="service_started_by_app" msgid="818675099014723551">"एप्‍स द्वारा प्रारंभ किया गया."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> रिक्त"</string>
@@ -1231,9 +1243,9 @@
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"प्रक्रियाएं"</string>
     <string name="service_stop" msgid="6369807553277527248">"रोकें"</string>
     <string name="service_manage" msgid="1876642087421959194">"सेटिंग"</string>
-    <string name="service_stop_description" msgid="9146619928198961643">"यह सेवा इसके एप्‍लिकेशन द्वारा प्रारंभ की गई थी. इसे रोकने से एप्‍लिकेशन विफल हो सकता है."</string>
-    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"इस एप्‍लिकेशन को सुरक्षित रूप से रोका नहीं जा सकता. यदि आप इसे रोकते हैं, तो आपका वर्तमान का कुछ कार्य खो सकता है."</string>
-    <string name="background_process_stop_description" msgid="5034773197139654588">"यह पुरानी एप्‍लिकेशन प्रक्रिया है जो अब भी इसलिए चल रही है कि संभवत: फिर से इसकी आवश्‍यकता हो. सामान्यत: इसे रोकने का कोई कारण नहीं है."</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"यह सेवा इसके एप्‍स द्वारा प्रारंभ की गई थी. इसे रोकने से एप्‍स विफल हो सकता है."</string>
+    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"इस एप्‍स को सुरक्षित रूप से रोका नहीं जा सकता. यदि आप इसे रोकते हैं, तो आपका वर्तमान का कुछ कार्य खो सकता है."</string>
+    <string name="background_process_stop_description" msgid="5034773197139654588">"यह पुरानी एप्‍स प्रक्रिया है जो अब भी इसलिए चल रही है कि संभवत: फिर से इसकी आवश्‍यकता हो. सामान्यत: इसे रोकने का कोई कारण नहीं है."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: वर्तमान में उपयोग में है. इसे नियंत्रित करने के लिए सेटिंग स्‍पर्श करें."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"मुख्‍य प्रक्रिया उपयोग में है."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"सेवा <xliff:g id="COMP_NAME">%1$s</xliff:g> उपयोग में हैं."</string>
@@ -1255,8 +1267,8 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"भौतिक कीबोर्ड सेटिंग"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" सम्‍मिलित करने के लिए Space कुंजी दो बार दबाएं"</string>
     <string name="show_password" msgid="3001113966880559611">"पासवर्ड दिखाई देगा"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"यह इनपुट विधि, पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा सहित आपके द्वारा लिखे जाने वाले सभी पाठ को एकत्र कर सकती है. यह <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> एप्‍लिकेशन से आती है. इस इनपुट विधि का उपयोग करें?"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह वर्तनी परीक्षण व्‍यक्तिगत डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर सहित आपके द्वारा लिखे जाने वाले सभी पाठ एकत्रित कर सकता है. यह एप्‍लिकेशन <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस वर्तनी परीक्षण का उपयोग करें?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"यह इनपुट विधि, पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा सहित आपके द्वारा लिखे जाने वाले सभी पाठ को एकत्र कर सकती है. यह <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> एप्‍स से आती है. इस इनपुट विधि का उपयोग करें?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह वर्तनी परीक्षण व्‍यक्तिगत डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर सहित आपके द्वारा लिखे जाने वाले सभी पाठ एकत्रित कर सकता है. यह एप्‍स <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस वर्तनी परीक्षण का उपयोग करें?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"सेटिंग"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"भाषा"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> के लिए सेटिंग खोलने में विफल रहा"</string>
@@ -1294,8 +1306,8 @@
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फ़ोन जानकारी"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"बैटरी जानकारी"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"त्वरित लॉन्च"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"एप्‍लिकेशन लॉन्‍च करने के लिए कीबोर्ड शॉर्टकट सेट करें"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"एप्‍लिकेशन सौंपें"</string>
+    <string name="quick_launch_summary" msgid="8101133819188001190">"एप्‍स लॉन्‍च करने के लिए कीबोर्ड शॉर्टकट सेट करें"</string>
+    <string name="quick_launch_assign_application" msgid="6240064079456617501">"एप्‍स सौंपें"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"कोई शॉर्टकट नहीं"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"खोज + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"साफ़ करें"</string>
@@ -1322,7 +1334,7 @@
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"भौतिक कीबोर्ड"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"भौतिक कीबोर्ड सेटिंग"</string>
     <string name="development_settings_title" msgid="215179176067683667">"डेवलपर विकल्प"</string>
-    <string name="development_settings_summary" msgid="1815795401632854041">"एप्‍लिकेशन विकास के लिए विकल्‍प सेट करें"</string>
+    <string name="development_settings_summary" msgid="1815795401632854041">"एप्‍स विकास के लिए विकल्‍प सेट करें"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"इस उपयोगकर्ता के लिए डेवलपर विकल्प उपलब्ध नहीं हैं"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB डीबग करना"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"डीबग मोड जब USB कनेक्‍ट किया गया हो"</string>
@@ -1336,25 +1348,25 @@
     <string name="select_runtime_title" msgid="649783802363155346">"रनटाइम चुनें"</string>
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"रनटाइम चुनें"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"रनटाइम को <xliff:g id="OLD">%1$s</xliff:g> से <xliff:g id="NEW">%2$s</xliff:g> में बदलने के लिए रीबूट करें?"</string>
-    <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस डिस्प्ले प्रमाणन"</string>
-    <string name="wifi_display_certification_summary" msgid="1155182309166746973">"वायरलेस डिस्प्ले प्रमाणन के लिए विकल्प दिखाएं"</string>
+    <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस दिखाई देने के लिए प्रमाणन"</string>
+    <string name="wifi_display_certification_summary" msgid="1155182309166746973">"वायरलेस दिखाई देने के लिए प्रमाणन विकल्प दिखाएं"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करने की अनुमति दें?"</string>
-    <string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग डीबग करने का उद्देश्‍य केवल विकास है. इसका उपयोग आपके कंप्‍यूटर और आपके उपकरण के बीच डेटा की प्रतिलिपि बनाने, बिना सूचना के आपके उपकरण पर एप्‍लिकेशन इंस्‍टॉल करने और लॉग डेटा पढ़ने के लिए करें."</string>
+    <string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग डीबग करने का उद्देश्‍य केवल विकास है. इसका उपयोग आपके कंप्‍यूटर और आपके उपकरण के बीच डेटा की प्रतिलिपि बनाने, बिना सूचना के आपके उपकरण पर एप्‍स इंस्‍टॉल करने और लॉग डेटा पढ़ने के लिए करें."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"आपके द्वारा पूर्व में प्राधिकृत सभी कंप्यूटर से USB डीबगिंग की पहुंच निरस्त करें?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"विकास सेटिंग की अनुमति दें?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"ये सेटिंग केवल विकास संबंधी उपयोग के प्रयोजन से हैं. वे आपके उपकरण और उस पर स्‍थित एप्स को खराब कर सकती हैं या उनके दुर्व्यवहार का कारण हो सकती हैं."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"USB पर एप्स सत्यापित करें"</string>
     <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"नुकसानदेह व्यवहार के लिए ADB/ADT के द्वारा इंस्टॉल किए गए एप्स जांचें."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB संग्रहण सुरक्षित करें"</string>
-    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"USB संग्रहण पढ़ने हेतु एप्‍लिकेशन को अनुमति का अनुरोध करना होगा"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"USB संग्रहण पढ़ने हेतु एप्‍स को अनुमति का अनुरोध करना होगा"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB संग्रहण सुरक्षित करें?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB संग्रहण के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा.\n\nहो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा नई जानकारी न मिलने तक कार्य न करें."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB संग्रहण के सुरक्षित होने पर, एप्‍स को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा.\n\nहो सकता है कुछ एप्‍स उनके डेवलपर द्वारा नई जानकारी न मिलने तक कार्य न करें."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD कार्ड सुरक्षित करें"</string>
-    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"SD कार्ड पढ़ने के लिए एप्‍लिकेशन को अनुमति का अनुरोध करना होगा"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"SD कार्ड पढ़ने के लिए एप्‍स को अनुमति का अनुरोध करना होगा"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD कार्ड सुरक्षित करें?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD कार्ड के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा.\n\nहो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा नई जानकारी न मिलने तक कार्य न करें."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD कार्ड के सुरक्षित होने पर, एप्‍स को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा.\n\nहो सकता है कुछ एप्‍स उनके डेवलपर द्वारा नई जानकारी न मिलने तक कार्य न करें."</string>
     <string name="enable_terminal_title" msgid="95572094356054120">"स्थानीय टर्मिनल"</string>
     <string name="enable_terminal_summary" msgid="67667852659359206">"स्थानीय शेल एक्सेस ऑफ़र करने वाला टर्मिनल एप्स सक्षम करें"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"गैजेट चुनें"</string>
@@ -1369,7 +1381,7 @@
     <string name="usage_stats_label" msgid="5890846333487083609">"उपयोग के आंकड़े"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"उपयोग के आंकड़े"</string>
     <string name="display_order_text" msgid="8592776965827565271">"इसके अनुसार क्रमित करें:"</string>
-    <string name="app_name_label" msgid="5440362857006046193">"एप्‍लिकेशन"</string>
+    <string name="app_name_label" msgid="5440362857006046193">"एप्‍स"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"गणना"</string>
     <string name="usage_time_label" msgid="295954901452833058">"उपयोग समय"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"पहुंच-योग्यता"</string>
@@ -1378,7 +1390,7 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"सिस्‍टम"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"कैप्शन"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"आवर्धन जेस्चर"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"इस सुविधा के चालू होने पर, आप स्क्रीन को तीन बार टैप करके ज़ूम इन और आउट कर सकते हैं.\n\nज़ूम इन होने पर, आप निम्न कार्य कर सकते हैं:\n"<ul><li>"पैन करना: स्क्रीन पर दो या अधिक अंगुलियों को खींचें."</li>\n<li>"ज़ूम स्तर एडजस्ट करना: दो या अधिक अंगुलियों को साथ में पिंच करें या उन्हें दूर फैलाएं."</li></ul>\n\n"आप तीन बार टैप करके और टैप किया हुआ रखकर, अपनी अंगुलियों के नीचे की सामग्री को अस्थायी रूप से आवर्धित भी कर सकते हैं. इस आवर्धित स्थिति में, आप स्क्रीन के विभिन्न भागों को एक्सप्लोर करने के लिए अपनी अंगुलियों को खींच सकते हैं. अपनी पूर्व स्थिति में पहुंचने के लिए अपनी अंगुली को उठाएं.\n\nध्यान दें: आवर्धन कार्यों के लिए कीबोर्ड और नेविगेशन बार को छोड़कर कहीं भी तीन बार टैप करें."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"इस सुविधा के चालू होने पर, आप स्क्रीन को तीन बार टैप करके ज़ूम इन और आउट कर सकते हैं.\n\nज़ूम इन होने पर, आप निम्न कार्य कर सकते हैं:\n"<ul><li>"पैन करना: स्क्रीन पर दो या अधिक अंगुलियों को खींचें."</li>\n<li>"ज़ूम स्तर एडजस्ट करना: दो या अधिक अंगुलियों को साथ में पिंच करें या उन्हें दूर फैलाएं."</li></ul>\n\n"आप तीन बार टैप करके और टैप किया हुआ रखकर, अपनी अंगुलियों के नीचे की सामग्री को अस्थायी रूप से आवर्धित भी कर सकते हैं. इस आवर्धित स्थिति में, आप स्क्रीन के विभिन्न भागों को एक्सप्लोर करने के लिए अपनी अंगुलियों को खींच सकते हैं. अपनी पूर्व स्थिति में पहुंचने के लिए अपनी अंगुली को उठाएं.\n\nध्यान दें: आवर्धन कार्यों के लिए कीबोर्ड और मार्गदर्शक बार को छोड़कर कहीं भी तीन बार टैप करें."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"पहुंच-योग्यता शॉर्टकट"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"चालू"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"बंद"</string>
@@ -1448,7 +1460,7 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्‍लग होने के बाद से बैटरी का उपयोग"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"रीसेट के बाद से बैटरी उपयोग"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"बैटरी पर <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"बैटरी पर <xliff:g id="TIME">%1$s</xliff:g> और है"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"अनप्लग करने के बाद से <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"चार्ज हो रही है"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"स्‍क्रीन चालू"</string>
@@ -1490,8 +1502,8 @@
     <string name="usage_type_on_time" msgid="3351200096173733159">"चालू करने का समय"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"बिना किसी सिग्‍नल के समय"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"बंद करना बाध्‍य करें"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"एप्‍लिकेशन जानकारी"</string>
-    <string name="battery_action_app_settings" msgid="4570481408106287454">"एप्‍लिकेशन सेटिंग"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"एप्‍स जानकारी"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"एप्‍स सेटिंग"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"स्‍क्रीन सेटिंग"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi सेटिंग"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth सेटिंग"</string>
@@ -1500,17 +1512,17 @@
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"फ़ोन के निष्‍क्रिय रहते समय उपयोग की गई बैटरी"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"सेल रेडियो द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"बिना सेट कवरेज वाले क्षेत्रों में पावर बचाने के लिए हवाई जहाज मोड पर स्‍विच करें"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"प्रदर्शन और बैकलाइट द्वारा उपयोग की गई बैटरी"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"स्‍क्रीन की चमक और/या स्‍क्रीन की समयबाह्य अवधि कम करें"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"स्क्रीन सेटिंग और बैकलाइट द्वारा उपयोग की गई बैटरी"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"स्‍क्रीन की रोशनी और/या स्‍क्रीन की समयबाह्य अवधि कम करें"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"जब Wi-Fi का उपयोग नहीं हो रहा हो या वह उपलब्‍ध नहीं हो, तो उसे बंद कर दें"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"जब आप Bluetooth का उपयोग न कर रहे हों, तो उसे बंद कर दें"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"किसी दूसरे Bluetooth उपकरण से कनेक्‍ट करने का प्रयास करें"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"एप्‍लिकेशन द्वारा उपयोग की गई बैटरी"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"एप्‍लिकेशन रोकें या अनइंस्‍टॉल करें"</string>
-    <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"एप्‍लिकेशन द्वारा GPS का उपयोग किए जाने से रोकने के लिए GPS को मैन्‍युअल रूप से नियंत्रित करें"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बैटरी के उपयोग में कमी लाने के लिए एप्‍लिकेशन, सेटिंग ऑफ़र कर सकता है"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"एप्‍स द्वारा उपयोग की गई बैटरी"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"एप्‍स रोकें या अनइंस्‍टॉल करें"</string>
+    <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"एप्‍स द्वारा GPS का उपयोग किए जाने से रोकने के लिए GPS को मैन्‍युअल रूप से नियंत्रित करें"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बैटरी के उपयोग में कमी लाने के लिए एप्‍स, सेटिंग ऑफ़र कर सकता है"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के द्वारा उपयोग की गई बैटरी"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"अनप्लग करने के बाद से <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"जब अंतिम बार <xliff:g id="UNPLUGGED">%1$s</xliff:g> के लिए अनप्‍लग किया गया"</string>
@@ -1528,16 +1540,16 @@
     <string name="services_subtitle" msgid="4296402367067266425">"सेवाएं"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ध्‍वनि इनपुट और आउटपुट"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ध्‍वनि इनपुट और आउटपुट सेटिंग"</string>
-    <string name="voice_search_settings_title" msgid="2775469246913196536">"ध्वनि खोज"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"बोलकर खोजें"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android कीबोर्ड"</string>
     <string name="voice_category" msgid="1430370497125803904">"वाक्"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"ध्‍वनि पहचानकर्ता"</string>
-    <string name="recognizer_settings_title" msgid="432493301215113154">"ध्वनि खोज"</string>
+    <string name="recognizer_settings_title" msgid="432493301215113154">"बोलकर खोजें"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"\'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\' के लिए सेटिंग"</string>
     <string name="tts_settings" msgid="8186971894801348327">"पाठ से वाक् सेटिंग"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"पाठ से वाक् आउटपुट"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"हमेशा मेरी सेटिंग का उपयोग करें"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"नीचे दी गईं डिफ़ॉल्ट सेटिंग एप्‍लिकेशन सेटिंग को ओवरराइड करती हैं"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"नीचे दी गईं डिफ़ॉल्ट सेटिंग एप्‍स सेटिंग को ओवरराइड करती हैं"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"डिफ़ॉल्‍ट सेटिंग"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"डिफ़ॉल्‍ट इंजन"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"बोले गए पाठ के लिए उपयोग किए जाने के लिए वाक् संश्लेषण इंजन सेट करता है"</string>
@@ -1593,7 +1605,7 @@
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
     <string name="gadget_sync" msgid="858895763714222152">"समन्वयन करें"</string>
-    <string name="gadget_brightness_template" msgid="930541920933123603">"चमक <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"स्क्रीन की रोशनी <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"स्वचालित"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"अधिकतम"</string>
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"आधा"</string>
@@ -1627,22 +1639,22 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"क्रेडेंशियल संग्रहण का उपयोग करने से पहले, आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"आपातकालीन टोन"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"बैकअप लें और रीसेट करें"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"बैकअप लें और रीसेट करें"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"बैकअप लें और पुनर्स्‍थापित करें"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"शुरक्षित करें और रीसेट करें"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"शुरक्षित करें और रीसेट करें"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"सुरक्षित करें और पुनर्स्‍थापित करें"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"निजी डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"मेरे डेटा का बैक अप लें"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"एप्स डेटा, Wi‑Fi पासवर्ड, और अन्य सेटिंग का Google सर्वर पर बैकअप लें"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"बैकअप खाता"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"शुरक्षित खाता"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"वर्तमान में कोई भी खाता बैकअप डेटा संग्रहीत नहीं कर रहा है"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"स्‍वचालित पुनर्स्थापना"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"किसी एप्‍लिकेशन को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"किसी एप्‍स को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्‍कटॉप बैकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉप के पूर्ण बैकअप के पासवर्ड को बदलने या निकालने के लिए स्‍पर्श करें."</string>
-    <string name="local_backup_password_toast_success" msgid="582016086228434290">"नया बैकअप पासवर्ड सेट किया गया"</string>
+    <string name="local_backup_password_toast_success" msgid="582016086228434290">"नया सुरक्षित पासवर्ड सेट किया गया"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"नया पासवर्ड तथा पुष्टि का मिलान नहीं होता है"</string>
-    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"बैकअप पासवर्ड सेट करने में विफल रहा"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"सुरक्षित पासवर्ड सेट करने में विफल रहा"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"अपने Wi-Fi पासवर्ड, बुकमार्क, अन्य सेटिंग और एप्स डेटा का बैक अप लेना रोकें, साथ ही Google सर्वर से सभी प्रतियां मिटाएं?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"उपकरण की व्‍यवस्‍थापन सेटिंग"</string>
@@ -1653,8 +1665,8 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"उपकरण व्‍यवस्‍थापक सक्रिय करें?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"सक्रिय करें"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"उपकरण व्‍यवस्‍थापक"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"इस व्‍यवस्‍थापक को सक्रिय करने से <xliff:g id="APP_NAME">%1$s</xliff:g> एप्‍लिकेशन निम्न कार्य कर सकेगा:"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"यह व्‍यवस्‍थापक सक्रिय है और एप्‍लिकेशन <xliff:g id="APP_NAME">%1$s</xliff:g> को निम्‍न कार्य करने देता है:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"इस व्‍यवस्‍थापक को सक्रिय करने से <xliff:g id="APP_NAME">%1$s</xliff:g> एप्‍स निम्न कार्य कर सकेगा:"</string>
+    <string name="device_admin_status" msgid="4252975713178851910">"यह व्‍यवस्‍थापक सक्रिय है और एप्‍स <xliff:g id="APP_NAME">%1$s</xliff:g> को निम्‍न कार्य करने देता है:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"शीर्षक-रहित"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"सामान्य"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"सूचनाएं"</string>
@@ -1716,7 +1728,7 @@
     <string name="sync_calendar" msgid="9056527206714733735">"कैलेंडर"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"संपर्क"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google sync में आपका स्वागत है!"</font>\n"आप जहां भी हों वहां से आपके संपर्क, अपॉइंटमेंट, और अन्य चीज़ों तक पहुंच की सुविधा देने के लिए डेटा को समन्‍वयित करने का Google का तरीका."</string>
-    <string name="header_application_sync_settings" msgid="6205903695598000286">"एप्‍लिकेशन समन्‍वयन सेटिंग"</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"एप्‍स समन्‍वयन सेटिंग"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"डेटा और सिंक्रनाइज़ेशन"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"पासवर्ड बदलें"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"खाता सेटिंग"</string>
@@ -1726,8 +1738,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"खाता निकालें?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यह खाता निकालने से, टेबलेट से खाते के सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"यह खाता निकालने से, फ़ोन से इसके सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"कुछ एप्‍लिकेशन के लिए यह खाता आवश्‍यक है. आप टेबलेट को सेटिंग &gt; बैकअप लें और रीसेट करें में फ़ैक्‍टरी डिफ़ॉल्‍ट (जो आपके सभी निजी डेटा को हटा देता है) पर रीसेट करके ही इसे हटा सकते हैं."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"कुछ एप्‍लिकेशन के लिए यह खाता आवश्‍यक है. आप फ़ोन को सेटिंग &gt; बैकअप लें और रीसेट करें में फ़ैक्‍टरी डिफ़ॉल्‍ट (जो आपके सभी निजी डेटा को हटा देता है) पर रीसेट करके ही इसे हटा सकते हैं."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"कुछ एप्‍स के लिए यह खाता आवश्‍यक है. आप टेबलेट को सेटिंग &gt; सुरक्षित करें और रीसेट करें में फ़ैक्‍टरी डिफ़ॉल्‍ट (जो आपके सभी निजी डेटा को हटा देता है) पर रीसेट करके ही इसे हटा सकते हैं."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"कुछ एप्‍स के लिए यह खाता आवश्‍यक है. आप फ़ोन को सेटिंग &gt; सुरक्षित करें और रीसेट करें में फ़ैक्‍टरी डिफ़ॉल्‍ट (जो आपके सभी निजी डेटा को हटा देता है) पर रीसेट करके ही इसे हटा सकते हैं."</string>
     <string name="provider_label" msgid="7724593781904508866">"पुश ग्राहकी"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -1752,7 +1764,7 @@
     <string name="select_application" msgid="5156029161289091703">"एप्स को चुनें"</string>
     <string name="no_application" msgid="2813387563129153880">"कुछ भी नहीं"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"डीबगर की प्रतीक्षा करें"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"डीबग किया गया एप्लि. निष्पादन के पहले अनुलग्न करने हेतु डीबगर की प्रतीक्षा करता है"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"डीबग किया गया एप्स निष्पादन के पहले अनुलग्न करने हेतु डीबगर की प्रतीक्षा करता है"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"इनपुट"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"आरेखण"</string>
     <string name="debug_hw_drawing_category" msgid="6220174216912308658">"हार्डवेयर त्वरित रेंडरिंग"</string>
@@ -1827,7 +1839,7 @@
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"मोबाइल डेटा"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G डेटा"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G डेटा"</string>
-    <string name="data_usage_app_settings" msgid="8430240158135453271">"एप्‍लिकेशन सेटिंग देखें"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"एप्‍स सेटिंग देखें"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"पृष्ठभूमि डेटा प्रतिबंधित करें"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"मो. नेटवर्क पर पृष्ठभूमि डेटा अक्षम करें. उपलब्ध होने पर गैर-मो. नेटवर्क का उपयोग होगा."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"इस एप्‍लि. के लिए पृष्ठभूमि डेटा प्रतिबंधित करने हेतु, पहले मो. डेटा सीमा सेट करें."</string>
@@ -1838,7 +1850,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"वेब पर आपके खातों में कोई भी परिवर्तन करने पर आपके टेबलेट में उसकी प्रतिलिपि स्‍वत: बन जाएगी.\n\nउसी प्रकार वेब पर टेबलेट में आपके द्वारा कोई भी परिवर्तन करने पर कुछ खाते उसकी प्रतिलिपि स्‍वत: बना सकते हैं. एक Google खाता इसी प्रकार कार्य करता है.\n\nचयन करने के लिए कि प्रत्‍येक खाते के अन्तर्गत किस प्रकार की जानकारीयां समन्‍वयित करना है, सेटिंग &gt; खाते पर जाएं."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"वेब पर आपके खातों में कोई भी परिवर्तन करने पर आपके फ़ोन में उसकी प्रतिलिपि स्‍वत: बन जाएगी.\n\nउसी प्रकार वेब पर फ़ोन में आपके द्वारा कोई भी परिवर्तन होने पर कुछ खाते उसकी प्रतिलिपि स्‍वत: बना सकते हैं. एक Google खाता इसी प्रकार कार्य करता है.\n\nचयन करने के लिए कि प्रत्‍येक खाते के अन्तर्गत किस प्रकार की जानकारीयां समन्‍वयित करना है, सेटिंग &gt; खाते पर जाएं."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"स्वत: समन्वयन डेटा बंद करें?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"यह डेटा और बैटरी उपयोग को संरक्षित करेगा, किन्‍तु हाल की जानकारी एकत्रित करने के लिए आपको प्रत्‍येक खाते का समन्‍वयन मैन्‍युअल रूप से करना होगा. और जब अपडेट होंगे तो आपको सूचनाएं प्राप्‍त नहीं होगी."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"यह डेटा और बैटरी उपयोग को संरक्षित करेगा, किन्‍तु हाल की जानकारी एकत्रित करने के लिए आपको प्रत्‍येक खाते का समन्‍वयन मैन्‍युअल रूप से करना होगा. और जब नई जानकारी मिलेगा तो आपको सूचनाएं प्राप्‍त नहीं होगी."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"उपयोग चक्र रीसेट दिनांक"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"प्रत्येक माह का दिनांक:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"सेट करें"</string>
@@ -1910,16 +1922,28 @@
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"सिस्‍टम CA प्रमाणपत्र अक्षम करना है?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"स्‍थायी रूप से उपयोगकर्ता CA प्रमाणपत्र निकालना चाहते हैं?"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"वर्तनी परीक्षक"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"अपना वर्तमान पूर्ण बैकअप पासवर्ड यहां लिखें"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"अपना वर्तमान पूर्ण सुरक्षित पासवर्ड यहां लिखें"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"पूर्ण बैकअप के लिए यहां नया पासवर्ड लिखें"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"यहां अपना नया पूर्ण बैकअप पासवर्ड पुन: लिखें"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"बैकअप पासवर्ड सेट करें"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"यहां अपना नया पूर्ण सुरक्षित पासवर्ड फिर से लिखें"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"सुरक्षित करने का पासवर्ड सेट करें"</string>
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</string>
     <string name="user_list_title" msgid="7937158411137563543">"उपयोगकर्ता और प्रोफ़ाइल"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"उपयोगकर्ता या प्रोफ़ाइल जोड़ें"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"एप्स और सामग्री की अनुमति दें"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले एप्स"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"एप्स सेटिंग विस्तृत करें"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"अक्षरों का आकार बदलें"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"भुगतान"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"हर बार पूछें"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"आपकी प्राथमिकता के रूप में सेट करें?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"प्रतिबंध"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"प्रतिबंधों को निकालें"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदलें"</string>
@@ -1980,7 +2012,7 @@
     <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>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"दिखाई देने के लिए आपातकालीन अलर्ट के प्रकारों को चुनें."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"एप्स और सामग्री प्रतिबंध"</string>
     <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"एप्स प्रतिबंधों को सेट करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d21f66d..688f3e4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Povezan"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Povezano (bez telefona)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Povezano (bez medija)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Povezano (bez telefona ili medija)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Niste povezani"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Isključivanje…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Zatražena je Bluetooth veza"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Dodirnite za povezivanje s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Želite li se povezati s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Zahtjev telefonskog imenika"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Korisnik %1$s želio bi pristupiti vašim kontaktima i povijesti poziva. Dati pristup korisniku %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Više me ne pitaj"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Više me ne pitaj"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Zahtjev za poruku"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti vašim porukama. Želite li dati pristup korisniku %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Postavke datuma i vremena"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Odabir vremenske zone"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ulazni uređaj"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Pristup internetu"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Dijeljenje internetske veze"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen sa zvuka medija."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Handsfree zvuk za uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen s ulaznog uređaja."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezano s medijskim zvukom"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezano sa telefonskim zvukom"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezano s poslužiteljem za prijenos datoteka"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niste povezani s poslužiteljem za prijenos datoteka"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Povezano s ulaznim uređajem"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Povezano s uređajem za pristup internetu"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Koristi za prijenos datoteke"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Upotrijebi za ulaz"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Upotrijebi za pristup internetu"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Postavke priključne stanice"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Koristi priključnu stanicu za zvuk"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao telefonski zvučnik"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Postavljanje Wi-Fi žarišne točke"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> prijenosna Wi-Fi žarišna točka"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Korisnici"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Dodavanje korisnika ili profila"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Dopuštanje aplikacija i sadržaja"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ova postavka utječe na sve korisnike na ovom tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Promjena jezika"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Promjena veličine fonta"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Plaćanja"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Pitaj svaki put"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Želite li to postaviti kao željeni način?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ograničenja"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Uklanjanje ograničenja"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promjena PIN-a"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 28e1fa9..53d04e8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Csatlakozva"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Csatlakoztatva (nincs telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Csatlakoztatva (nincs hordozó)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Csatlakoztatva (nincs telefon vagy hordozó)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Szétkapcsolva"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Szétkapcsolás..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-kapcsolat kérése"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Érintse meg a(z) \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eszközhöz való csatlakozáshoz."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Szeretne csatlakozni a következő eszközhöz: \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonkönyv kérése"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"A(z) %1$s szeretne hozzáférni névjegyeihez és a híváselőzményekhez. Megadja a hozzáférést a(z) %2$s eszköznek?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ne jelenjen meg többé"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne jelenjen meg többé"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Üzenetkérés"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"A(z) %1$s hozzáférést kér üzeneteihez. Biztosítja a(z) %2$s számára a hozzáférést?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Dátum és idő beállításai"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Válasszon időzónát"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Beviteli eszköz"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetelérés"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetkapcsolat megosztása"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a hordozóeszköz hangkimenetéről."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a kihangosító hangkimenetéről."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a beviteli eszközről."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Csatlakoztatva az eszköz hangjához"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Csatlakoztatva a telefon hangjához"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Csatlakozva a fájlküldő szerverhez"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nincs csatlakozva a fájlküldő szerverhez"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Beviteli eszköz csatlakoztatva"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Eszközhöz csatlakozik az interneteléréshez"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Felhasználás fájlátvitelre"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Használat beviteli eszközként"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Használat internetelérésre"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dokkolási beállítások"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dokkoló használata a hanghoz"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefonhangszóróként"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi hotspot beállítása"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> hordozható Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
@@ -1922,6 +1934,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Felhasználók"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Felhasználók és profilok"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Felhasználó vagy profil hozzáadása"</string>
@@ -1967,13 +1991,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Alkalmazások és tartalmak engedélyezése"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Alkalmazások korlátozásokkal"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Alkalmazásbeállítás megnyitása"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ez a beállítás minden felhasználót érint ezen a táblagépen."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Nyelv módosítása"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Betűméret módosítása"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Fizetések"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Mindig rákérdez"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Beállítja preferenciaként?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Beállítja előnyben részesítettként?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Mindig használja a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazást érintéssel való fizetéskor?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Mindig a(z) <xliff:g id="APP_0">%1$s</xliff:g> alkalmazást használja a(z) <xliff:g id="APP_1">%2$s</xliff:g> helyett érintéssel való fizetéskor?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Korlátozások"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Korlátozások feloldása"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN kód módosítása"</string>
diff --git a/res/values-hy-rAM-nokeys/strings.xml b/res/values-hy-rAM-nokeys/strings.xml
new file mode 100644
index 0000000..9c76a6b
--- /dev/null
+++ b/res/values-hy-rAM-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Կառավարել ծրագրերը"</string>
+</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 0d91745..9e81dfd 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -133,6 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Միացված է"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Միացված (առանց հեռախոսի)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Միացված է (առանց մեդիա)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Միացված է (հաղորդագրությանը մուտք չկա)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Միացված է (առանց հեռախոսի և մեդիայի)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Անջատված է"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Անջատվում է..."</string>
@@ -163,11 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth կապի հայց"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Հպել` «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»-ին միանալու համար:"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ցանկանու՞մ եք միանալ «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»-ին:"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Հեռախոսահամարների գրքույկի հայց"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Հեռախոսագիրք մուտք գործելու հայց"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s-ը ուզում է մուտք գործել ձեր կոնտակտներ ու զանգերի պատմություն: Տա՞լ մուտքի իրավունք %2$s-ին:"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Նորից չհարցնել"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Նորից չհարցնել"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Հաղորդագրության հարցում"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Հաղորդագրություն մուտք գործելու հայց"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ը ցանկանում է մատչել ձեր հաղորդագրությունները: Մուտք տա՞լ %2$s-ին:"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ամսաթիվ &amp; ժամային կարգավորումներ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ընտրել ժամային գոտին"</string>
@@ -479,6 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ներմուծման սարք"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ինտերնետի մուտք"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ինտերնետ կապի տարածում"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Մուտք հաղորդագրություն"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի մեդիա աուդիոյից:"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի անձեռն աուդիոյից:"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի ներածման սարքից:"</string>
@@ -494,6 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Միացված է մեդիա աուդիոյին"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Միացված է հեռախոսի ձայնային տվյալներին"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Միացված է ֆայլերի փոխանցման սերվերին"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Միացված է քարտեզին"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ֆայլերը փոխանցող սերվերի հետ կապ չկա"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Միացված է մուտքային սարքին"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Կապակցված է սարքին` ինտերնետ մուտք գործելու համար"</string>
@@ -503,6 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Օգտագործել ֆայլի փոխանցման համար"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Օգտագործել ներմուծման համար"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Օգտագործել ինտերնետ մուտք գործելու համար"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Օգտագործել քարտեզի համար"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Հարակցման կարգավորումներ"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Օգտագործել համակցումը աուդիոյի համար"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Որպես բարձրախոս հեռախոս"</string>
@@ -694,6 +698,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Կարգավորել Wi‑Fi թեժ կետը"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> դյուրակիր Wi‑Fi թեժ կետ"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android թեժ կետ"</string>
+    <string name="home_settings" msgid="212375129455718176">"Հիմնական"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ցուցադրել"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Հեռախոսի զանգերանգ"</string>
@@ -1627,7 +1632,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Վկայականների պահոցն օգտագործելու համար անհրաժեշտ է, որ էկրանը կողպող PIN կամ գաղտնաբառ կիրառեք:"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Արտակարգ իրավիճակ ահազանգող ազդանշան"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Սահմանել վարքը արտակարգ իրավիճակների զանգի դեպքում"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Պահուստավորել և վերակայել"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Պահուստավորում և վերակայում"</string>
     <string name="privacy_settings_title" msgid="4856282165773594890">"Պահուստավորում &amp; վերականգնում"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Պահուստավորել &amp; վերականգնել"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Անձնական տվյալներ"</string>
@@ -1920,6 +1925,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Անջատված"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Թույլատրելի"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Պարտադրում"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Օգտվողներ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Օգտվողներ &amp; պրոֆիլներ"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Ավելացնել օգտվող կամ պրոֆիլ"</string>
@@ -1965,13 +1982,20 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Թույլատրել ծրագրերը և բովանդակությունը"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Սահմանափակումներով ծրագրեր"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ընդլայնել ծրագրի կարգավորումները"</string>
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Ապատեղադրել այս ծրագիրը"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Այս կարգավորումը ազդեցություն ունի այս գրասալիկի բոլոր օգտվողների վրա:"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Այս կարգավորումը ազդեցություն ունի այս հեռախոսի բոլոր օգտվողների վրա:"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Փոխել լեզուն"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Փոխել տառաչափը"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Վճարումներ"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Հարցնել ամեն անգամ"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Սահմանե՞լ որպես նախընտրանք"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Սահմանափակումներ"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Հանել սահմանափակումները"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Փոխել PIN-ը"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 8658010..ac1a883 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"monitor lokasi"</item>
     <item msgid="5753382310468855812">"memantau lokasi berdaya tinggi"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokasi"</item>
+    <item msgid="8677040780775113033">"Lokasi"</item>
+    <item msgid="1660743989948992916">"Lokasi"</item>
+    <item msgid="8791172739860195290">"Getar"</item>
+    <item msgid="383413555642128046">"Membaca kontak"</item>
+    <item msgid="3654594895269697313">"Ubah kontak"</item>
+    <item msgid="7928393476362362538">"Baca log panggilan"</item>
+    <item msgid="6248591205254641116">"Ubah log panggilan"</item>
+    <item msgid="6093344633066170692">"Membaca kalender"</item>
+    <item msgid="1334886368750347692">"Ubah kalender"</item>
+    <item msgid="1638204101698708656">"Lokasi"</item>
+    <item msgid="2154671955760380322">"Pemberitahuan pos"</item>
+    <item msgid="4282477730595931828">"Lokasi"</item>
+    <item msgid="4891423912898525905">"Telepon"</item>
+    <item msgid="2623604824935968113">"Baca SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Tulis SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Terima SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Terima SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Terima SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Terima SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Kirim SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Baca SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Tulis SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Ubah setelan"</item>
+    <item msgid="736541391767350377">"Gambar di atas"</item>
+    <item msgid="5530815681721654194">"Akses pemberitahuan"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Rekam audio"</item>
+    <item msgid="3493046322001257041">"Putar audio"</item>
+    <item msgid="136815868796597058">"Baca papan klip"</item>
+    <item msgid="5238692940326972503">"Ubah papan klip"</item>
+    <item msgid="5753789168376302997">"Tombol media"</item>
+    <item msgid="3265262911688671938">"Fokus audio"</item>
+    <item msgid="2098976479485046797">"Volume utama"</item>
+    <item msgid="5660213838861789350">"Volume suara"</item>
+    <item msgid="7983336752371254444">"Volume dering"</item>
+    <item msgid="7878027809189330917">"Volume media"</item>
+    <item msgid="7260546305036218513">"Volume alarm"</item>
+    <item msgid="9103719301075748925">"Volume pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Volume bluetooth"</item>
+    <item msgid="4665183401128289653">"Tetap aktif"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
+    <item msgid="7669257279311110599">"Lokasi"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
     <item msgid="2560532955514699713">"Sedang"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bac0e9c..ecebf60 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Terhubung"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Terhubung (bukan telepon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Terhubung (kecuali media)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Terhubung (bukan telepon atau media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Sambungan terputus"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutus sambungan..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Permintaan sambungan bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Sentuh untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Sambungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Permintaan buku telepon"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ingin mengakses kontak dan riwayat panggilan Anda. Berikan akses ke %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Jangan tanya lagi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Permintaan pesan"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses pesan Anda. Berikan akses pada %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setelan tanggal &amp; waktu"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Perangkat masukan"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Berbagi sambungan internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari perangkat masukan."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tersambung ke media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tersambung ke audio ponsel"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer file"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak tersambung kepada server transfer file"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Terhubung ke perangkat masukan"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tersambung ke perangkat untuk akses Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk transfer file"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk masukan"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Digunakan untuk akses internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setelan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Siapkan hotspot Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Tambahkan pengguna atau profil"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Izinkan aplikasi dan konten"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan batasan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Luaskan setelan untuk aplikasi"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ubah bahasa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Ubah ukuran font"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pembayaran"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Tanyakan setiap kali"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Jadikan preferensi Anda?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Batasan"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Hapus batasan"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ubah PIN"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 02750ad..d3bd485 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connesso"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Collegato (telefono escluso)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Collegato (contenuti multimed. esclusi)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Collegato (telef. o conten. mult. esclusi)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnesso"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnessione..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Richiesta di connessione Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Tocca per connetterti a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vuoi connetterti a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Richiesta rubrica"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s desidera accedere ai tuoi contatti e alla tua cronologia chiamate. Consentire l\'accesso a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Non chiedermelo più"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Non chiedermelo più"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Richiesta di accesso ai messaggi"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s desidera accedere ai tuoi messaggi. Dare accesso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Impostazioni data e ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Scegli il fuso orario"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo di input"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accesso Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Condivisione connessione Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio multimediale."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio vivavoce."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dal dispositivo di input."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Collegato ad audio media"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Collegato ad audio telefono"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Collegato al server di trasferimento file"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Non collegato al server di trasferimento file"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connesso a dispositivo di input"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connesso a dispositivo per accesso Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usa per trasferimento file"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizza per l\'input"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usa per accesso Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Impostazioni dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Usa dock per audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configura hotspot Wi‑Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Hotspot Wi‑Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portatile"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"HotspotAndroid"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
@@ -993,7 +1005,7 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Sarà annullato il tethering per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reti mobili"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gestione piano dati mobili"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gestione piano dati mobile"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operatore SIM sconosciuto"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Nessun sito web di provisioning per %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserisci la scheda SIM e riavvia"</string>
@@ -1009,7 +1021,7 @@
     <string name="location_category_app_settings" msgid="46434611182743486">"Impostazioni app"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Elevato utilizzo della batteria"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Basso utilizzo della batteria"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"Modalità di localizzazione"</string>
+    <string name="location_mode_screen_title" msgid="4528716772270246542">"Modalità di geolocalizzazione"</string>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Reti GPS, Wi-Fi e mobili per la stima della posizione"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Reti Wi-Fi e mobili per la stima della posizione"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Usa GPS per individuare la posizione"</string>
@@ -1033,7 +1045,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Visualizza informazioni legali, stato, versione del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaboratori"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informazioni normative"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Normative"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termini e condizioni"</string>
@@ -1700,7 +1712,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Sincron., invio e ricezione dati possibili in ogni momento"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Disatt. dati backgr.?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"La disattivazione dei dati in background aumenta la durata della batteria e riduce l\'utilizzo dei dati. Alcune applicazioni potrebbero utilizzare comunque la connessione dati in background."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Sincr. automatica"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Sincronizz. automatica"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronizzazione attiva"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"La sincronizzazione non è attiva"</string>
     <string name="sync_error" msgid="5060969083117872149">"Errore sincronizz."</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Utenti"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utenti e profili"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Aggiungi utente o profilo"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Consenti app e contenuti"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applicazioni con limitazioni"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Espandi impostazioni per app"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Questa impostazione influisce su tutti gli utenti di questo tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambia lingua"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambia le dimensioni del carattere"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagamenti"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Chiedi ogni volta"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Impostare come preferenza?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Impostare come preferenza?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Utilizzare sempre <xliff:g id="APP">%1$s</xliff:g> quando tocchi e paghi?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Utilizzare sempre <xliff:g id="APP_0">%1$s</xliff:g> anziché <xliff:g id="APP_1">%2$s</xliff:g> quando tocchi e paghi?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Limitazioni"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Rimuovi limitazioni"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambia PIN"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b9525a0..d95a841 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"מחובר"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"מחובר (ללא טלפון)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"מחובר (ללא מדיה)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"מחובר (ללא טלפון או מדיה)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"מנותק"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"מתנתק..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"‏בקשה לחיבור Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"גע כדי להתחבר אל <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"האם ברצונך להתחבר אל \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"בקשה לספר טלפונים"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"‏%1$s רוצה לגשת לאנשי הקשר ולהיסטוריית השיחות שלך. האם להעניק ל-%2$s גישה?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"אל תשאל שוב"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"אל תשאל שוב"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"בקשת הודעה"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s רוצה לגשת להודעות שלך. להעניק גישה ל-%2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"הגדרות תאריך ושעה"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"בחר אזור זמן"</string>
@@ -301,8 +305,8 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"מיין לפי אזור זמן"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"תאריך"</string>
     <string name="time_picker_title" msgid="483460752287255019">"שעה"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"שיפור התאמת פרצוף"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"וידוא פרצוף"</string>
+    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"שיפור התאמת פנים"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"פנים אמיתיות"</string>
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"דרוש מצמוץ עיניים בעת ביטול נעילה"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"נעילה אוטומטית"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> לאחר שינה"</string>
@@ -353,12 +357,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"שינוי נעילת מסך"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"‏שנה או השבת אבטחת קו, PIN או סיסמה"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"בחר שיטה לנעילת המסך"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"כש\'זיהוי פרצוף\' לא יכול לראות אותך, איך אתה רוצה לבטל את הנעילה?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"כש\'זיהוי פנים\' לא יכול לראות אותך, איך אתה רוצה לבטל את הנעילה?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ללא"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"הסט"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"אין אבטחה"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"זיהוי פרצוף"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"זיהוי פנים"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"אבטחה נמוכה, ניסיוני"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"קו"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"אבטחה בינונית"</string>
@@ -369,7 +373,7 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"הושבת על ידי מדיניות ההצפנה של מנהל המערכת, או אחסון האישורים"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ללא"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"הסט"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"זיהוי פרצוף"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"זיהוי פנים"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"קו ביטול נעילה"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"סיסמה"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"מכשיר קלט"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"גישה לאינטרנט"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"שיתוף חיבור לאינטרנט"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של המדיה."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של הדיבורית."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק ממכשיר הקלט."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"מחובר לאודיו של מדיה"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"מחובר לאודיו של הטלפון"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"מחובר לשרת העברת קבצים"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"לא מחובר לשרת העברת קבצים"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"מחובר למכשיר קלט"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"מחובר למכשיר לצורך גישה לאינטרנט"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"השתמש להעברת קבצים"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"השתמש לקלט"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"השתמש עבור גישה לאינטרנט"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"הגדרות עגינה"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"שימוש בעגינה לאודיו"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"כטלפון דיבורית"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"‏הגדר נקודה חמה של Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"‏נקודה חמה ניידת של Wi-Fi ‏<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ‏<xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
@@ -1508,7 +1520,7 @@
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"‏כבה את Bluetooth כשאינך משתמש בו"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"‏נסה להתחבר למכשיר Bluetooth אחר"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"צריכת הסוללה על ידי יישומים"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"הפסק את היישום או הסר את התקנתו"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"הפסק את האפליקציה או הסר אותה"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"‏שלוט ב-GPS באופן ידני כדי למנוע מהיישום להשתמש בו"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ייתכן שהיישום מציע הגדרות לצמצום צריכת הסוללה"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"סוללה בשימוש על ידי משתמש"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"מושבת"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"מתירני"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"אכיפה"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"משתמשים"</string>
     <string name="user_list_title" msgid="7937158411137563543">"משתמשים ופרופילים"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"הוסף משתמש או פרופיל"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"אפשר יישומים ותוכן"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"יישומים והגבלות"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור היישום"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"הגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"שנה שפה"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"שנה גודל גופן"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"תשלומים"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"שאל בכל פעם"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"האם להגדיר בתור ההעדפה שלך?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"הגבלות"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"הסר הגבלות"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"‏שנה PIN"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 93e9abb..a0122d2 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"場所を監視"</item>
     <item msgid="5753382310468855812">"高精度の現在地情報を監視"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置情報"</item>
+    <item msgid="8677040780775113033">"位置情報"</item>
+    <item msgid="1660743989948992916">"位置情報"</item>
+    <item msgid="8791172739860195290">"バイブレーション"</item>
+    <item msgid="383413555642128046">"連絡先の読み取り"</item>
+    <item msgid="3654594895269697313">"連絡先の変更"</item>
+    <item msgid="7928393476362362538">"通話履歴の読み取り"</item>
+    <item msgid="6248591205254641116">"通話履歴の変更"</item>
+    <item msgid="6093344633066170692">"カレンダーの読み取り"</item>
+    <item msgid="1334886368750347692">"カレンダーの変更"</item>
+    <item msgid="1638204101698708656">"位置情報"</item>
+    <item msgid="2154671955760380322">"通知の投稿"</item>
+    <item msgid="4282477730595931828">"位置情報"</item>
+    <item msgid="4891423912898525905">"通話の発信"</item>
+    <item msgid="2623604824935968113">"SMS/MMSの読み取り"</item>
+    <item msgid="4420177125221176306">"SMS/MMSの書き込み"</item>
+    <item msgid="3986142739951490025">"SMS/MMSの受信"</item>
+    <item msgid="3984213795861739778">"SMS/MMSの受信"</item>
+    <item msgid="3656243523752472788">"SMS/MMSの受信"</item>
+    <item msgid="8105802370238551510">"SMS/MMSの受信"</item>
+    <item msgid="1407766984645388488">"SMS/MMSの送信"</item>
+    <item msgid="3527273606643794973">"SMS/MMSの読み取り"</item>
+    <item msgid="4370895547001583812">"SMS/MMSの書き込み"</item>
+    <item msgid="4218544235221631789">"設定の変更"</item>
+    <item msgid="736541391767350377">"上部に描画"</item>
+    <item msgid="5530815681721654194">"通知へのアクセス"</item>
+    <item msgid="781213371706962767">"カメラ"</item>
+    <item msgid="1720492593061838172">"音声の録音"</item>
+    <item msgid="3493046322001257041">"音声の再生"</item>
+    <item msgid="136815868796597058">"クリップボードの読み取り"</item>
+    <item msgid="5238692940326972503">"クリップボードの変更"</item>
+    <item msgid="5753789168376302997">"メディアボタン"</item>
+    <item msgid="3265262911688671938">"音声フォーカス"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"音声の音量"</item>
+    <item msgid="7983336752371254444">"着信音の音量"</item>
+    <item msgid="7878027809189330917">"メディアの音量"</item>
+    <item msgid="7260546305036218513">"アラームの音量"</item>
+    <item msgid="9103719301075748925">"通知の音量"</item>
+    <item msgid="7025966722295861512">"Bluetoothの音量"</item>
+    <item msgid="4665183401128289653">"スリープモードにしない"</item>
+    <item msgid="8584357129746649222">"場所"</item>
+    <item msgid="7669257279311110599">"現在地"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
     <item msgid="2560532955514699713">"中"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9c8d436..e4baa82 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -135,6 +135,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"接続"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"接続済み(電話を除く)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"接続済み(メディアを除く)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"接続済み(電話/メディアを除く)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"切断"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"切断中..."</string>
@@ -165,11 +167,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth接続リクエスト"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続するにはタップしてください。"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続してもよろしいですか?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"電話帳のリクエスト"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$sが連絡先と通話履歴にアクセスしようとしています。%2$sにアクセスを許可しますか?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"次回から表示しない"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"次回から表示しない"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"メッセージリクエスト"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$sがメッセージにアクセスしようとしています。%2$sにアクセスを許可しますか?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日付と時刻"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"タイムゾーンの選択"</string>
@@ -481,6 +485,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"入力デバイス"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"インターネットアクセス"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"インターネット接続の共有"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>はメディアの音声から切断されます。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>はハンズフリー音声デバイスから切断されます。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>は入力デバイスから切断されます。"</string>
@@ -496,6 +502,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"メディアの音声に接続"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"携帯電話の音声に接続"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ファイル転送サーバーに接続"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ファイル転送サーバーに接続しない"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"入力デバイスに接続されています"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"インターネットアクセス用に接続"</string>
@@ -505,6 +513,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ファイル転送に使用"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"入力に使用"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"インターネットアクセスに使用する"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ホルダーの設定"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"音声をホルダーに出力"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"スピーカーフォン"</string>
@@ -696,6 +706,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fiアクセスポイントをセットアップ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
@@ -1926,6 +1938,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"ユーザー"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ユーザーとプロフィール"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"ユーザーまたはプロフィールを追加"</string>
@@ -1971,13 +1995,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"制限のあるアプリ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"アプリの設定を展開"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"この設定はこのタブレット上のすべてのユーザーに影響します。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"この設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"言語の変更"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"フォントサイズの変更"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"支払い"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"その都度確認"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"設定として保存しますか?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"制限"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"制限を削除"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PINを変更"</string>
diff --git a/res/values-ka-rGE-nokeys/strings.xml b/res/values-ka-rGE-nokeys/strings.xml
new file mode 100644
index 0000000..01a33ed
--- /dev/null
+++ b/res/values-ka-rGE-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"აპლიკაციების მართვა"</string>
+</resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index e85c79a..ec6cd80 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"მდებარეობის მონიტორინგი"</item>
     <item msgid="5753382310468855812">"მაღალი ძაბვის მდებარეობის მონიტორინგი"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"მდებარეობა"</item>
+    <item msgid="8677040780775113033">"მდებარეობა"</item>
+    <item msgid="1660743989948992916">"მდებარეობა"</item>
+    <item msgid="8791172739860195290">"ვიბრაცია"</item>
+    <item msgid="383413555642128046">"კონტაქტების წაკითხვა"</item>
+    <item msgid="3654594895269697313">"კონტაქტების შეცვლა"</item>
+    <item msgid="7928393476362362538">"ზარების ჟურნალის ნახვა"</item>
+    <item msgid="6248591205254641116">"ზარების ჟურნალის ჩასწორება"</item>
+    <item msgid="6093344633066170692">"კალენდრის წაკითხვა"</item>
+    <item msgid="1334886368750347692">"კალენდრის ჩასწორება"</item>
+    <item msgid="1638204101698708656">"მდებარეობა"</item>
+    <item msgid="2154671955760380322">"შეტყობინების გამოქვეყნება"</item>
+    <item msgid="4282477730595931828">"მდებარეობა"</item>
+    <item msgid="4891423912898525905">"ტელეფონზე დარეკვა"</item>
+    <item msgid="2623604824935968113">"SMS/MMS-ის წაკითხვა"</item>
+    <item msgid="4420177125221176306">"SMS/MMS-ის დაწერა"</item>
+    <item msgid="3986142739951490025">"SMS/MMS-ის მიღება"</item>
+    <item msgid="3984213795861739778">"SMS/MMS მიღება"</item>
+    <item msgid="3656243523752472788">"SMS/MMS მიღება"</item>
+    <item msgid="8105802370238551510">"SMS/MMS-ის მიღება"</item>
+    <item msgid="1407766984645388488">"SMS/MMS გაგზავნა"</item>
+    <item msgid="3527273606643794973">"SMS/MMS-ის წაკითხვა"</item>
+    <item msgid="4370895547001583812">"SMS/MMS-ის დაწერა"</item>
+    <item msgid="4218544235221631789">"პარამეტრების შეცვლა"</item>
+    <item msgid="736541391767350377">"დახაზვა ზემოთ"</item>
+    <item msgid="5530815681721654194">"შეტყობინებებზე წვდომა"</item>
+    <item msgid="781213371706962767">"კამერა"</item>
+    <item msgid="1720492593061838172">"აუდიოს ჩაწერა"</item>
+    <item msgid="3493046322001257041">"აუდიოს დაკვრა"</item>
+    <item msgid="136815868796597058">"გაცვლის ბუფერის წაკითხვა"</item>
+    <item msgid="5238692940326972503">"გაცვლის ბუფერის შეცვლა"</item>
+    <item msgid="5753789168376302997">"მედიის ღილაკები"</item>
+    <item msgid="3265262911688671938">"აუდიოს ფოკუსი"</item>
+    <item msgid="2098976479485046797">"მასტერ-ხმის სიმძლავრე"</item>
+    <item msgid="5660213838861789350">"ხმის სიმძღლავრე"</item>
+    <item msgid="7983336752371254444">"ზარის სიმძლავრე"</item>
+    <item msgid="7878027809189330917">"მედიის ხმა"</item>
+    <item msgid="7260546305036218513">"მაღვიძარას ხმა"</item>
+    <item msgid="9103719301075748925">"შეტყობინების ხმა"</item>
+    <item msgid="7025966722295861512">"Bluetooth-ის ხმა"</item>
+    <item msgid="4665183401128289653">"დარჩეს აქტიური"</item>
+    <item msgid="8584357129746649222">"მდებარეობა"</item>
+    <item msgid="7669257279311110599">"მდებარეობა"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"მოკლე"</item>
     <item msgid="2560532955514699713">"საშუალო"</item>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 571ac0e..fc83e73 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"შეერთებულია"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"დაკავშირებულია (ტელეფონის გარდა)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"მიერთებულია (მედიის გარდა)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"დაკავშირება (გარდა ტელეფონისა და მედიისა)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"კავშირი გაწყვეტილია"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"მიმდინარეობს გათიშვა…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-ის დაკავშირების თხოვნა"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"დასაკავშირებლად შეეხეთ „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“-ს."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"გსურთ „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“-თან დაკავშირება?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"ტელეფონების წიგნის მოთხოვნა"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s სურს თქვენს კონტაქტებსა და ზარების ჟურნალთან დაკავშირება. ვუზრუნველყოთ %2$s წვდომით?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"აღარ მკითხო"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"აღარ მკითხო"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"შეტყობინების მოთხოვნა"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ს უნდა თქვენს შეტყობინებებზე წვდომა. მისცემთ %2$s-ს წვდომას?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"თარიღის და დროის პარამეტრები"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"დროის ზონის არჩევა"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"შეყვანის მოწყობილობა"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ინტერნეტზე წვდომა"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ინტერნეტ კავშირის გაზიარება"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> გაითიშება მედია აუდიოსგან."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> გაითიშება უხელო რეჟიმის აუდიოდან."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> გაითიშება შენატანი მოწყობილობისგან."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"დაკავშირებულია აუდიო მულტიმედიურ სისტემასთან"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"დაკავშირებულია ტელეფონის აუდიო მოწყობილობასთან"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"დაკავშირებულია ფაილების გადაცემის სერვერთან"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"არ არის დაკავშირებული ფაილების ტრანსფერის სერვერთან"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"დაკავშირებულია შეყვანის მოწყობილობასთან"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"დაკავშირებულია მოწყობილობასთან ინტერნეტთან წვდომისთვის"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ფაილების ტრანსფერისათვის გამოყენება"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"შეტანისთვის გამოყენება"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"გამოიყენე ინტერნეტთან წვდომისთვის"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"სამაგრის პარამეტრები"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"აუდიოსთვის სამაგრის გამოყენება"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ხმამაღლამოსაუბრე კავშირისათვის"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"დააყენეთ Wi‑Fi უსადენო ქსელი"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> პორტატიული Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ხმა"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ტელეფონის ზარი"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"გამორთულია"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"მხოლოდ გაფრთხილება"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"სრულდება"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"მომხმარებლები"</string>
     <string name="user_list_title" msgid="7937158411137563543">"მომხმარებლები და პროფილები"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"მომხმარებლის ან პროფილის დამატება"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"აპებისა და კონტენტის დაშვება"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"აპლიკაციები შეზღუდვებით"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"აპლიკაციის პარამეტრების გაფართოება"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ეს პარამეტრები გავრცელდება ამ ტაბლეტის ყველა მომხმარებელზე."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ეს პარამეტრები გავრცელდება ამ ტელეფონის ყველა მომხმარებელზე."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ენის შეცვლა"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"შრიფტის ზომის შეცვლა"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Payments"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"მკითხე ყოველ ჯერზე"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"დაყენდეს, როგორც უპირატესი?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"შეზღუდვები"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"შეზღუდვების მოშორება"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN-ის შეცვლა"</string>
diff --git a/res/values-km-rKH-nokeys/strings.xml b/res/values-km-rKH-nokeys/strings.xml
new file mode 100644
index 0000000..080bac8
--- /dev/null
+++ b/res/values-km-rKH-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"គ្រប់គ្រង​កម្មវិធី"</string>
+</resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index 4c686db..9573015 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"តាមដាន​ទីតាំង"</item>
     <item msgid="5753382310468855812">"​ពិនិត្យ​ទីតាំង​ថាមពល​​ខ្ពស់"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"ទី​តាំង"</item>
+    <item msgid="8677040780775113033">"ទី​តាំង"</item>
+    <item msgid="1660743989948992916">"ទី​តាំង"</item>
+    <item msgid="8791172739860195290">"ញ័រ"</item>
+    <item msgid="383413555642128046">"អាន​ទំនាក់ទំនង"</item>
+    <item msgid="3654594895269697313">"កែ​ទំនាក់ទំនង"</item>
+    <item msgid="7928393476362362538">"អាន​កំណត់ហេតុ​ហៅ"</item>
+    <item msgid="6248591205254641116">"កែ​បញ្ជី​ហៅ"</item>
+    <item msgid="6093344633066170692">"អាន​ប្រតិទិន"</item>
+    <item msgid="1334886368750347692">"កែ​ប្រតិទិន"</item>
+    <item msgid="1638204101698708656">"ទី​តាំង"</item>
+    <item msgid="2154671955760380322">"ប្រកាស​ការ​ជូន​ដំណឹង"</item>
+    <item msgid="4282477730595931828">"ទី​តាំង"</item>
+    <item msgid="4891423912898525905">"ហៅ​ទូរស័ព្ទ"</item>
+    <item msgid="2623604824935968113">"អាន​សារ SMS/MMS"</item>
+    <item msgid="4420177125221176306">"សរសេរ​សារ SMS/MMS"</item>
+    <item msgid="3986142739951490025">"ទទួល SMS/MMS"</item>
+    <item msgid="3984213795861739778">"ទទួល SMS/MMS"</item>
+    <item msgid="3656243523752472788">"ទទួល SMS/MMS"</item>
+    <item msgid="8105802370238551510">"ទទួល SMS/MMS"</item>
+    <item msgid="1407766984645388488">"ផ្ញើ SMS/MMS"</item>
+    <item msgid="3527273606643794973">"អាន​សារ SMS/MMS"</item>
+    <item msgid="4370895547001583812">"សរសេរ​សារ SMS/MMS"</item>
+    <item msgid="4218544235221631789">"កែ​ការ​កំណត់"</item>
+    <item msgid="736541391767350377">"គូរ​​​ខាង​លើ"</item>
+    <item msgid="5530815681721654194">"​ជូន​ដំណឹង​ចូល​ដំណើរការ"</item>
+    <item msgid="781213371706962767">"ម៉ាស៊ីន​ថត"</item>
+    <item msgid="1720492593061838172">"ថត​សំឡេង"</item>
+    <item msgid="3493046322001257041">"ចាក់អូឌីយ៉ូ"</item>
+    <item msgid="136815868796597058">"អាន​ក្ដារតម្បៀតខ្ទាស់"</item>
+    <item msgid="5238692940326972503">"កែ​ក្ដារតម្បៀតខ្ទាស់"</item>
+    <item msgid="5753789168376302997">"ប៊ូតុង​មេឌៀ"</item>
+    <item msgid="3265262911688671938">"ការ​ផ្ដោត​សំឡេង"</item>
+    <item msgid="2098976479485046797">"កម្រិត​សំឡេង​មេ"</item>
+    <item msgid="5660213838861789350">"កម្រិត​សំឡេង"</item>
+    <item msgid="7983336752371254444">"កម្រិត​សំឡេង​រោទ៍"</item>
+    <item msgid="7878027809189330917">"កម្រិត​សំឡេង​មេឌៀ"</item>
+    <item msgid="7260546305036218513">"កម្រិត​សំឡេង​រោទ៍"</item>
+    <item msgid="9103719301075748925">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
+    <item msgid="7025966722295861512">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
+    <item msgid="4665183401128289653">"មិន​ដេក"</item>
+    <item msgid="8584357129746649222">"ទី​តាំង"</item>
+    <item msgid="7669257279311110599">"ទី​តាំង"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ខ្លី"</item>
     <item msgid="2560532955514699713">"មធ្យម"</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 54c4e67..6065f86 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"បាន​តភ្ជាប់"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"បាន​តភ្ជាប់ (គ្មាន​ទូរស័ព្ទ)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"បាន​តភ្ជាប់ (គ្មាន​មេឌៀ)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"បាន​តភ្ជាប់ (គ្មាន​ទូរស័ព្ទ ឬ​មេឌៀ)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"បាន​ផ្ដាច់"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"កំពុង​ផ្ដាច់…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ស្នើ​តភ្ជាប់​ប៊្លូធូស"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"ប៉ះ ដើម្បី​តភ្ជាប់​ជា​មួយ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ។"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"តើ​អ្នក​ចង់​តភ្ជាប់​ទៅ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"ការ​ស្នើ​សៀវភៅ​ទូរស័ព្ទ"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ចង់​ចូល​ទំនាក់ទំនង​ និង​ប្រវត្តិ​ហៅ​របស់​អ្នក។ ផ្ដល់​សិទ្ធិ​ឲ្យ %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"កុំ​សួរ​ម្ដងទៀត"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"កុំ​សួរ​ម្ដងទៀត"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"សំណើ​រ​សារ"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ចង់​ចូល​ដំណើរការ​សារ​របស់​អ្នក។ សូម​ផ្ដល់​ការ​ចូល​ដំណើរការ​ទៅ​កាន់​%2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"ការ​កំណត់​កាលបរិច្ឆេទ &amp; ពេលវេលា"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ជ្រើស​តំបន់​ពេល​វេលា"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ឧបករណ៍​បញ្ចូល"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ចូល​អ៊ីនធឺណិត"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ចែករំលែក​ការ​តភ្ជាប់​អ៊ីនធឺណិត"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់​ពី​សំឡេង​មេឌៀ។"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់​ពី​អូឌីយ៉ូ​កាស។"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់​ពី​ឧបករណ៍​បញ្ចូល។"</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"បា​ន​ភ្ជាប់​ទៅ​អូឌីយ៉ូ​មេឌៀ"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"តភ្ជាប់​ទៅ​អូឌីយ៉ូ​ទូរស័ព្ទ"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"បាន​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​មេ​ផ្ទេរ​ឯកសារ"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"មិន​បាន​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​មេ​ផ្ទេរ​ឯកសារ"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"បាន​តភ្ជាប់​ទៅ​ឧបករណ៍​បញ្ចូល"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"បាន​តភ្ជាប់​​ឧបករណ៍​សម្រាប់​ចូល​អ៊ីនធឺណិត"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ប្រើ​សម្រាប់​ផ្ទេរ​ឯកសារ"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ប្រើ​សម្រាប់​បញ្ចូល"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ប្រើ​សម្រាប់​ចូល​អ៊ីនធឺណិត"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"កំណត់​ការ​ចត"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ប្រើ​ការ​ភ្ជាប់​សម្រាប់​សំឡេង"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ជា​​អូប៉ាល័រ​ទូរស័ព្ទ"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"រៀបចំ​ hotspot វ៉ាយហ្វាយ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> hotspot វ៉ាយហ្វាយ​ចល័ត"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"សំឡេង​រោទ៍​ទូរស័ព្ទ"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"បិទ"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"អនុញ្ញាត"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"បង្ខំ"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"អ្នកប្រើ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"អ្នកប្រើ &amp; ប្រវត្តិរូប"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"បន្ថែម​អ្នក​ប្រើ ឬ​ប្រវត្តិរូប"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"អនុញ្ញាត​កម្មវិធី និង​មាតិកា"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"កម្មវិធី​មាន​ការ​ដាក់កម្រិត"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ពង្រីក​ការ​កំណត់​សម្រាប់​កម្មវិធី"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ការកំណត់​នេះ​ប៉ះពាល់​ដល់​អ្នក​ប្រើ​ទាំងអស់​លើ​កុំព្យូទ័រ​បន្ទះ​នេះ។"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ការ​កំណត់​នេះ​ប៉ះពាល់​ដល់​អ្នក​ប្រើ​ទាំងអស់​លើ​ទូរស័ព្ទ​នេះ។"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ប្ដូរ​ភាសា"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"ប្ដូរ​ទំហំ​ពុម្ពអក្សរ"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"ការ​បង់​ប្រាក់"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"សួរ​រាល់​ពេល"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"កំណត់​ជា​ចំណូលចិត្ត​របស់​អ្នក?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"ការ​ដាក់​កម្រិត"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"យក​ការ​ដាក់កម្រិត​ចេញ"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"ប្ដូរ​កូដ PIN"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index d680df1..a7d9715 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"위치 모니터링"</item>
     <item msgid="5753382310468855812">"고전력 위치 모니터링"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"위치"</item>
+    <item msgid="8677040780775113033">"위치"</item>
+    <item msgid="1660743989948992916">"위치"</item>
+    <item msgid="8791172739860195290">"진동"</item>
+    <item msgid="383413555642128046">"주소록 읽기"</item>
+    <item msgid="3654594895269697313">"주소록 수정"</item>
+    <item msgid="7928393476362362538">"통화 기록 읽기"</item>
+    <item msgid="6248591205254641116">"통화 기록 수정"</item>
+    <item msgid="6093344633066170692">"캘린더 읽기"</item>
+    <item msgid="1334886368750347692">"캘린더 수정"</item>
+    <item msgid="1638204101698708656">"위치"</item>
+    <item msgid="2154671955760380322">"소식 알림"</item>
+    <item msgid="4282477730595931828">"위치"</item>
+    <item msgid="4891423912898525905">"전화 걸기"</item>
+    <item msgid="2623604824935968113">"SMS/MMS 읽기"</item>
+    <item msgid="4420177125221176306">"SMS/MMS 쓰기"</item>
+    <item msgid="3986142739951490025">"SMS/MMS 수신"</item>
+    <item msgid="3984213795861739778">"SMS/MMS 수신"</item>
+    <item msgid="3656243523752472788">"SMS/MMS 수신"</item>
+    <item msgid="8105802370238551510">"SMS/MMS 수신"</item>
+    <item msgid="1407766984645388488">"SMS/MMS 전송"</item>
+    <item msgid="3527273606643794973">"SMS/MMS 읽기"</item>
+    <item msgid="4370895547001583812">"SMS/MMS 쓰기"</item>
+    <item msgid="4218544235221631789">"설정 수정"</item>
+    <item msgid="736541391767350377">"위에 그림"</item>
+    <item msgid="5530815681721654194">"액세스 알림"</item>
+    <item msgid="781213371706962767">"카메라"</item>
+    <item msgid="1720492593061838172">"오디오 녹음"</item>
+    <item msgid="3493046322001257041">"오디오 재생"</item>
+    <item msgid="136815868796597058">"클립보드 읽기"</item>
+    <item msgid="5238692940326972503">"클립보드 수정"</item>
+    <item msgid="5753789168376302997">"미디어 버튼"</item>
+    <item msgid="3265262911688671938">"오디오 포커스"</item>
+    <item msgid="2098976479485046797">"마스터 볼륨"</item>
+    <item msgid="5660213838861789350">"음성 볼륨"</item>
+    <item msgid="7983336752371254444">"벨소리 볼륨"</item>
+    <item msgid="7878027809189330917">"미디어 볼륨"</item>
+    <item msgid="7260546305036218513">"알람 볼륨"</item>
+    <item msgid="9103719301075748925">"알림 볼륨"</item>
+    <item msgid="7025966722295861512">"블루투스 볼륨"</item>
+    <item msgid="4665183401128289653">"켜진 상태로 유지"</item>
+    <item msgid="8584357129746649222">"위치"</item>
+    <item msgid="7669257279311110599">"위치"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
     <item msgid="2560532955514699713">"보통"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7ead569..a22b27f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"연결됨"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"연결됨(전화 없음)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"연결됨(미디어 없음)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"연결됨(전화 또는 미디어 없음)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"연결 끊김"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"연결을 끊는 중…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"블루투스 연결 요청"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하려면 터치하세요."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하시겠습니까?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"전화번호부 요청"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s이(가) 주소록과 통화 기록에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"다시 묻지 않음"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"다시 묻지 않음"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"메시지 요청"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s이(가) 메시지에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"날짜 및 시간 설정"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"시간대 선택"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"입력 장치"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"인터넷 액세스"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"인터넷 연결 공유"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 미디어 오디오의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 핸즈프리 오디오의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 입력 장치의 연결이 끊어집니다."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"미디어 오디오에 연결됨"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"휴대전화 오디오에 연결됨"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"파일 전송 서버에 연결됨"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"파일 전송 서버에 연결되지 않았습니다."</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"입력 장치에 연결됨"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"인터넷 액세스를 위해 기기에 연결됨"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"파일 전송에 사용"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"입력에 사용"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"인터넷 액세스에 사용"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"도크 설정"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"오디오에 도크 사용"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"스피커폰으로 사용"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi 핫스팟 설정"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SECURITY">%2$s</xliff:g><xliff:g id="NETWORK_SSID">%1$s</xliff:g> 휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
@@ -1091,8 +1103,8 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"앱 설정"</string>
     <string name="install_applications" msgid="4872012136210802181">"알 수 없는 소스"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"알 수 없는 출처의 앱 설치 허용"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"태블릿 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 태블릿 손상이나 데이터 손실에 대해 사용자에게 책임이 있음에 동의합니다."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"휴대전화 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대해 사용자에게 책임이 있음에 동의합니다."</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"태블릿 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 태블릿 손상이나 데이터 손실에 대한 책임은 사용자에게 있음에 동의합니다."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"휴대전화 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대한 책임은 사용자에게 있음에 동의합니다."</string>
     <string name="verify_applications" msgid="2959359554974828518">"앱 확인"</string>
     <string name="verify_applications_summary" msgid="6737505521913263792">"유해할 수 있는 앱의 설치를 허용하지 않거나 경고 표시"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"고급 설정"</string>
@@ -1329,7 +1341,7 @@
     <string name="clear_adb_keys" msgid="4038889221503122743">"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" msgid="1146389631208760344">"화면 켜짐 상태 유지"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"충전하는 동안 화면이 꺼지지 않음"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"블루투스 HCI 스누프 로그 사용"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"모든 블루투스 HCI 패킷을 하나의 파일에 캡처"</string>
@@ -1432,7 +1444,7 @@
     <string name="print_settings" msgid="4742428530112487843">"인쇄"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"프린트 서비스"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
-    <string name="print_service_security_warning_summary" msgid="919299459931111450">"인쇄한 문서를 <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>에서 받을 수 있습니다. 이런 문서에는 민감한 데이터가 포함되어 있을 수 있습니다."</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"인쇄한 문서를 <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>에서 받을 수 있습니다. 문서에는 민감한 데이터가 포함되어 있을 수 있습니다."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"설치된 서비스 없음"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"설정"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"프린터 추가"</string>
@@ -1519,10 +1531,10 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"미디어 서버"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"프로세스 통계"</string>
-    <string name="process_stats_summary" msgid="109387941605607762">"프로세스 실행에 관한 특이한 통계"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"프로세스 실행에 관한 통계"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"메모리 사용량"</string>
-    <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g>을(를) 초과하는 통계"</string>
-    <string name="process_stats_memory_status" msgid="4251599550196193093">"현재 기기 메모리가 <xliff:g id="MEMSTATE">%1$s</xliff:g>입니다."</string>
+    <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> 동안의 통계"</string>
+    <string name="process_stats_memory_status" msgid="4251599550196193093">"현재 기기 메모리 수준: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
     <string name="process_stats_ram_use" msgid="1271366870003042708">"평균 RAM 사용"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"재생 시간"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"서비스"</string>
@@ -1796,7 +1808,7 @@
     <string name="show_all_anrs" msgid="28462979638729082">"모든 ANR 보기"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"백그라운드 앱에 대해 앱 응답 없음 대화상자 표시"</string>
     <string name="experimental_webview" msgid="4492200819033780927">"시험용 WebView 사용"</string>
-    <string name="experimental_webview_summary" msgid="3431620080869482446">"앱에서 최신(베타) WebView를 사용합니다."</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"앱에서 최신(베타) WebView 사용"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"데이터 사용량"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"데이터 사용 주기"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"데이터 로밍"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"사용 안함"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"허가"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"시행"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"사용자"</string>
     <string name="user_list_title" msgid="7937158411137563543">"사용자 및 프로필"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"사용자 또는 프로필 추가"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"앱 및 콘텐츠 허용"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"애플리케이션 제한"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"애플리케이션을 위한 설정 확장"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"언어 변경"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"글꼴 크기 변경"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"결제"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"항상 확인"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"기본으로 설정하시겠습니까?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"제한사항"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"제한사항 삭제"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN 변경"</string>
diff --git a/res/values-lo-rLA-nokeys/strings.xml b/res/values-lo-rLA-nokeys/strings.xml
new file mode 100644
index 0000000..921e177
--- /dev/null
+++ b/res/values-lo-rLA-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"ຈັດການແອັບພລິເຄຊັນ"</string>
+</resources>
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index ee500b0..dbe1724 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"ຕຳແໜ່ງ​ຕິດ​ຕາມ"</item>
     <item msgid="5753382310468855812">"ຕິດຕາມສະຖານທີ່ທີ່ມີພະລັງງານສູງ"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"ຕຳແໜ່ງ"</item>
+    <item msgid="8677040780775113033">"Location"</item>
+    <item msgid="1660743989948992916">"Location"</item>
+    <item msgid="8791172739860195290">"ສັ່ນເຕືອນ"</item>
+    <item msgid="383413555642128046">"ອ່ານລາຍຊື່ຜູ່ຕິດຕໍ່"</item>
+    <item msgid="3654594895269697313">"ແກ້ໄຂລາຍຊື່ຜູ່ຕິດຕໍ່"</item>
+    <item msgid="7928393476362362538">"ອ່ານບັນທຶກການໂທ"</item>
+    <item msgid="6248591205254641116">"ແກ້ໄຂບັນທຶກການໂຕ"</item>
+    <item msgid="6093344633066170692">"ອ່ານປະຕິທິນ"</item>
+    <item msgid="1334886368750347692">"ແກ້ໄຂປະຕິທິນ"</item>
+    <item msgid="1638204101698708656">"ສະຖານທີ່"</item>
+    <item msgid="2154671955760380322">"ການແຈ້ງເຕືອນໂພສ"</item>
+    <item msgid="4282477730595931828">"Location"</item>
+    <item msgid="4891423912898525905">"ໂທຫາໂທລະສັບ"</item>
+    <item msgid="2623604824935968113">"ອ່ານ SMS/MMS"</item>
+    <item msgid="4420177125221176306">"ຂຽນ SMS/MMS"</item>
+    <item msgid="3986142739951490025">"ຮັບ SMS/MMS"</item>
+    <item msgid="3984213795861739778">"ຮັບ SMS/MMS"</item>
+    <item msgid="3656243523752472788">"ຮັບ SMS/MMS"</item>
+    <item msgid="8105802370238551510">"ຮັບ SMS/MMS"</item>
+    <item msgid="1407766984645388488">"ສົ່ງ SMS/MMS"</item>
+    <item msgid="3527273606643794973">"ອ່ານ SMS/MMS"</item>
+    <item msgid="4370895547001583812">"ຂຽນ SMS/MMS"</item>
+    <item msgid="4218544235221631789">"ແກ້ໄຂການຕັ້ງຄ່າ"</item>
+    <item msgid="736541391767350377">"ແຕ້ມທາງ​ເທິງ"</item>
+    <item msgid="5530815681721654194">"ເຂົ້າເຖິງການແຈ້ງເຕືອນ"</item>
+    <item msgid="781213371706962767">"ກ້ອງ"</item>
+    <item msgid="1720492593061838172">"ບັນທຶກສຽງ"</item>
+    <item msgid="3493046322001257041">"ຫຼິ້ນສຽງ"</item>
+    <item msgid="136815868796597058">"ອ່ານຄລິບບອດ"</item>
+    <item msgid="5238692940326972503">"ແກ້ໄຂຄລິບບອດ"</item>
+    <item msgid="5753789168376302997">"ປຸ່ມ​ມີເດຍ"</item>
+    <item msgid="3265262911688671938">"Audio focus"</item>
+    <item msgid="2098976479485046797">"ລະດັບສຽງຫຼັກ"</item>
+    <item msgid="5660213838861789350">"ລະດັບສຽງເວົ້າ"</item>
+    <item msgid="7983336752371254444">"ລະດັບສຽງເຕືອນ"</item>
+    <item msgid="7878027809189330917">"ລະດັບສຽງມີເດຍ"</item>
+    <item msgid="7260546305036218513">"ລະດັບສຽງໂມງປຸກ"</item>
+    <item msgid="9103719301075748925">"ລະດັບສຽງແຈ້ງເຕືອນ"</item>
+    <item msgid="7025966722295861512">"ລະດັບສຽງ Bluetooth"</item>
+    <item msgid="4665183401128289653">"ເຮັດວຽກຕະຫຼອດເວລາ"</item>
+    <item msgid="8584357129746649222">"ສະຖານທີ່"</item>
+    <item msgid="7669257279311110599">"ສະຖານທີ່"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ສັ້ນ"</item>
     <item msgid="2560532955514699713">"ຂະໜາດກາງ"</item>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 0c94e85..b8aa199 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -133,6 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"ເຊື່ອມ​ຕໍ່ແລ້ວ"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີໂທລະສັບ)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີສື່)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ເຊື່ອມຕໍ່ (ບໍ່ມີການເຂົ້າເຖິງຂໍ້ຄວາມ)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີໂທລະສັບ ຫຼືສື່)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"ກຳລັງຢຸດການເຊື່ອມຕໍ່..."</string>
@@ -163,11 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ການ​ຮ້ອງ​ຂໍ​ການ​ເຊື່ອມ​ຕໍ່ Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"ແຕະເພື່ອເຊື່ອມຕໍ່ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ທ່ານຕ້ອງການເຊື່ອມຕໍ່ຫາ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ບໍ່?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"ຄຳຂໍສະໝຸດໂທລະສັບ"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ຮ້ອງຂໍການເຂົ້າເຖິງປຶ້ມໂທລະສັບ"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ຕ້ອງການເຂົ້າເຖິງລາຍຊື່ຜູ່ຕິດຕໍ່ ແລະປະຫວັດການໂທຂອງທ່ານ. ອະນຸມັດການເຂົ້າເຖິງ %2$s ຫຼືບໍ່?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"ບໍ່ຕ້ອງຖາມຄືນ"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ບໍ່ຕ້ອງຖາມຄືນ"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"ການ​ຮ້ອງ​ຂໍ​ຂໍ້​ຄວາມ"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"ຮ້ອງຂໍການເຂົ້າເຖິງຂໍ້ຄວາມ"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ຕ້ອງການສິດເພື່ອເຂົ້າໄປຂໍ້ຄວາມຂອງທ່ານ. ໃຫ້ສິດແກ່ %2$s ຫຼືບໍ່?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"ການຕັ້ງຄ່າວັນທີ &amp; ເວລາ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ເລືອກເຂດເວລາ"</string>
@@ -479,6 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ອຸປະກອນປ້ອນຂໍ້ມູນ"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ການເຂົ້າເຖິງອິນເຕີເນັດ"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ການແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"ການ​ເຂົ້າ​ເຖິງ​ຂໍ້​ຄວາມ"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຖອດການເຊື່ອມຕໍ່ຈາກສື່ດ້ານສຽງ."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຕັດການເຊື່ອມຕໍ່ຈາກລະບົບແຮນຟຣີ."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຢຸດການເຊື່ອມຕໍ່ຈາກອຸປະກອນປ້ອນຂໍ້ມູນ."</string>
@@ -494,6 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ເຊື່ອມຕໍ່ກັບສື່ດ້ານສຽງແລ້ວ"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ເຊື່ອມຕໍ່ກັບສຽງໂທລະສັບແລ້ວ"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ເຊື່ອມຕໍ່ກັບເຊີບເວີໂອນຍ້າຍໄຟລ໌ແລ້ວ"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ເຊື່ອມ​ຕໍ່​ກັບ​ແຜນ​ທີ່ແລ້ວ"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ບໍ່ໄດ້ເຊື່ອມຕໍ່ຫາເຊີບເວີໂອນຍ້າຍໄຟລ໌"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ເຊື່ອມຕໍ່ກັບອຸປະກອນປ້ອນຂໍ້ມູນແລ້ວ"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ເຊື່ອມຕໍ່ກັບອຸປະກອນເພື່ອເຂົ້າເຖິງອິນເຕີເນັດແລ້ວ"</string>
@@ -503,6 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ໃຊ້ເພື່ອໂອນຍ້າຍໄຟລ໌"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ໃຊ້ສຳລັບການປ້ອນຂໍ້ມູນ"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ໃຊ້ເພື່ອເຂົ້າອິນເຕີເນັດ"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ໃຊ້ສຳລັບແຜນທີ່"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ຕັ້ງຄ່າໂຕຕັ້ງສາກ"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ໃຊ້ບ່ອນຕັ້ງສາກສຳລັບສຽງ"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ເປັນລຳໂພງ"</string>
@@ -694,6 +698,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ຕັ້ງຄ່າ Wi-Fi ຮັອດສະປອດ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Wi-Fi ຮັອດສະປອດເຄື່ອນທີ່ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <string name="home_settings" msgid="212375129455718176">"ໜ້າຫຼັກ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ສຽງ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ຣິງໂທນໂທລະສັບ"</string>
@@ -1920,6 +1925,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"ປິດການນຳໃຊ້"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"​ອະ​ນຸ​ຍາດ"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"ການ​ບັງ​ຄັບ​ໃຊ້"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"ຜູ່ໃຊ້"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ຜູ່ໃຊ້ &amp; ໂປຣໄຟລ໌"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"ເພີ່ມຜູ່ໃຊ້ ຫຼືໂປຣໄຟລ໌"</string>
@@ -1965,13 +1982,20 @@
     <string name="application_restrictions" msgid="8207332020898004394">"ອະນຸຍາດແອັບຯ ແລະເນື້ອຫາ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ແອັບພລິເຄຊັນທີ່ມີຂໍ້ຈຳກັດ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ຂະຫຍາຍການຕັ້ງຄ່າສຳລັບແອັບພລິເຄຊັນ"</string>
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"ຖອນ​ການ​ຕິດ​ຕັ້ງ​ແອັບພລິເຄຊັ່ນນີ້"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ການຕັ້ງຄ່ານີ້ຈະມີຜົນກັບທຸກຜູ່ໃຊ້ໃນແທັບເລັດນີ້."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ການຕັ້ງຄ່ານີ້ຈະມີຜົນກັບທຸກຜູ່ໃຊ້ໃນໂທລະສັບນີ້."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ປ່ຽນພາສາ"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"ປ່ຽນຂະໜາດໂຕອັກສອນ"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"ການຊຳລະເງິນ"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"ຖາມທຸກຄັ້ງ"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"ກຳນົດເປັນຄ່າທີ່ທ່ານຕ້ອງການ?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"ການ​ຈໍາ​ກັດ"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"ລຶບການຈຳກັດ"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"​ປ່ຽນ​ PIN"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index cf5f100..5894da4 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="8166647333858618801">"Mažas"</item>
     <item msgid="1932071435506638315">"Įprastas"</item>
     <item msgid="38373998008112077">"Didelis"</item>
-    <item msgid="7786168277516233536">"Didžiulis"</item>
+    <item msgid="7786168277516233536">"Didžiausias"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Labai lėtas"</item>
@@ -149,7 +149,7 @@
     <item msgid="2245412278046491293">"Prastas"</item>
     <item msgid="5615082285463430971">"Neblogas"</item>
     <item msgid="3565079809875324621">"Gera"</item>
-    <item msgid="5702329417707689835">"Puiki"</item>
+    <item msgid="5702329417707689835">"Puikus"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Visada"</item>
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"stebėti vietovę"</item>
     <item msgid="5753382310468855812">"stebėti didelė galia vietovė"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Vietovė"</item>
+    <item msgid="8677040780775113033">"Vietovė"</item>
+    <item msgid="1660743989948992916">"Vietovė"</item>
+    <item msgid="8791172739860195290">"Vibruoti"</item>
+    <item msgid="383413555642128046">"Skaityti kontaktus"</item>
+    <item msgid="3654594895269697313">"Keisti kontaktus"</item>
+    <item msgid="7928393476362362538">"Skaityti skambučių žurnalą"</item>
+    <item msgid="6248591205254641116">"Keisti skambučių žurnalą"</item>
+    <item msgid="6093344633066170692">"Skaityti kalendorių"</item>
+    <item msgid="1334886368750347692">"Keisti kalendorių"</item>
+    <item msgid="1638204101698708656">"Vietovė"</item>
+    <item msgid="2154671955760380322">"Paskelbti pranešimą"</item>
+    <item msgid="4282477730595931828">"Vietovė"</item>
+    <item msgid="4891423912898525905">"Skambinti į telefoną"</item>
+    <item msgid="2623604824935968113">"Skaityti SMS / MMS"</item>
+    <item msgid="4420177125221176306">"Rašyti SMS / MMS"</item>
+    <item msgid="3986142739951490025">"Gauti SMS / MMS"</item>
+    <item msgid="3984213795861739778">"Gauti SMS / MMS"</item>
+    <item msgid="3656243523752472788">"Gauti SMS / MMS"</item>
+    <item msgid="8105802370238551510">"Gauti SMS / MMS"</item>
+    <item msgid="1407766984645388488">"Siųsti SMS / MMS"</item>
+    <item msgid="3527273606643794973">"Skaityti SMS / MMS"</item>
+    <item msgid="4370895547001583812">"Rašyti SMS / MMS"</item>
+    <item msgid="4218544235221631789">"Keisti nustatymus"</item>
+    <item msgid="736541391767350377">"Piešti viršuje"</item>
+    <item msgid="5530815681721654194">"Pasiekti pranešimus"</item>
+    <item msgid="781213371706962767">"Fotoaparatas"</item>
+    <item msgid="1720492593061838172">"Įrašyti garso įrašą"</item>
+    <item msgid="3493046322001257041">"Leisti garso įrašą"</item>
+    <item msgid="136815868796597058">"Skaityti iškarpinę"</item>
+    <item msgid="5238692940326972503">"Keisti iškarpinę"</item>
+    <item msgid="5753789168376302997">"Medijos mygtukai"</item>
+    <item msgid="3265262911688671938">"Garso sutelktis"</item>
+    <item msgid="2098976479485046797">"Pagrindinis garsumas"</item>
+    <item msgid="5660213838861789350">"Balso garsumas"</item>
+    <item msgid="7983336752371254444">"Skambučio garsumas"</item>
+    <item msgid="7878027809189330917">"Medijos garsumas"</item>
+    <item msgid="7260546305036218513">"Signalo garsumas"</item>
+    <item msgid="9103719301075748925">"Pranešimo garsumas"</item>
+    <item msgid="7025966722295861512">"„Bluetooth“ garsumas"</item>
+    <item msgid="4665183401128289653">"Neužmigdyti"</item>
+    <item msgid="8584357129746649222">"Vietovė"</item>
+    <item msgid="7669257279311110599">"Vietovė"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
     <item msgid="2560532955514699713">"Vidutinis"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 579c225..b07a45b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Prisijungta"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Prijungta (be telefono)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Prijungta (be laikmenos)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Prijungta (be telefono ar laikmenos)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atsijungęs (-usi)"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Atjungiama..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"„Bluetooth“ ryšio užklausa"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Palieskite, kad prisijungtumėte prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ar norite prisijungti prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonų knygelės užklausa"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s nori pasiekti jūsų kontaktus ir skambučių istoriją. Suteikti prieigą %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Daugiau neklausti"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Daugiau neklausti"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Pranešimo užklausa"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s nori pasiekti jūsų pranešimus. Suteikti prieigą %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datos ir laiko nustatymai"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pasirinkite laiko juostą"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Įvesties įrenginys"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prieiga prie interneto"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneto ryšio bendrinimas"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo medijos garso."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo laisvų rankų įrangos garso."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo įvesties įrenginio."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Prijungta prie medijos garso įrašo"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Prijungta prie telefono garso"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Prijungta prie failų perkėlimo serverio"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neprijungta prie failų perkėlimo serverio"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Prisijungta prie įvesties įrenginio."</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pr. prie įr., kad gaut. pr. prie int."</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Naudoti failų perkėlimui"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Naudoti įvedant"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Naudoti interneto prieigai"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Doko nustatymai"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Naudoti doką garsui"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaip kalbėtojo telefonas"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nustatyti „Wi-Fi“ viešosios interneto prieigos tašką"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kilnojamasis „Wi-Fi“ viešosios interneto prieigos taškas"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"„AndroidHotspot“"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Naudotojai"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Naudotojai ir profiliai"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Pridėti naudotoją ar profilį"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Leisti programas ir turinį"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programos su apribojimais"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Išplėsti programos nustatymus"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Šis nustatymas turi įtakos visiems šio planšetinio kompiuterio naudotojams."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis nustatymas turi įtakos visiems šio telefono naudotojams."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Keisti kalbą"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Keisti šrifto dydį"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Mokėjimai"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Klausti kaskart"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nustatyti kaip jūsų nuostatą?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Apribojimai"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Pašalinti apribojimus"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Keisti PIN kodą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2fb86b3..e3549ba 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Izveidots savienojums"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Savienojums ir izveidots (nav tālruņa)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Sav. ir izveidots (nav multivides)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Sav. ir izveidots (nav tel. vai multiv.)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atvienots"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Notiek atvienošana..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth savienojuma pieprasījums"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Pieskarieties, lai izveidotu savienojumu ar ierīci<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vai vēlaties izveidot savienojumu ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Tālruņu kataloga pieprasījums"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Ierīce %1$s vēlas piekļūt jūsu kontaktpersonām un zvanu vēsturei. Vai sniegt piekļuvi ierīcei %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nejautāt atkārtoti"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nejautāt atkārtoti"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Ziņojuma pieprasījums"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Ierīce “%1$s” vēlas piekļūt jūsu ziņojumiem. Vai sniegt piekļuvi ierīcei “%2$s”?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datuma un laika iestatījumi"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Laika joslas izvēle"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ievades ierīce"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Interneta piekļuve"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneta savienojuma koplietošana"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no datu nesēja audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no brīvroku audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no ievades ierīces."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Savienots ar multivides audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Savienots ar tālruņa audio"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Savienots ar failu pārsūtīšanas serveri"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nav savienots ar failu pārsūtīšanas serveri"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Izveidots savienojums ar ievades ierīci"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Savien. ar ier., lai nodr. int. piekļ."</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Izmantot faila pārsūtīšanai"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Izmantot ievadei"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Izmantot, lai piekļūtu internetam"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Doka iestatījumi"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Audio pakalpojumam izmantot doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kā mikrofons ar skaļruni"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Iestatīt Wi-Fi tīklāju"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> pārnēsājams Wi-Fi tīklājs"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tālruņa zvana signāls"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Lietotāji"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Lietotāji un profili"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Pievienot lietotāju vai profilu"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Lietotņu un satura atļaušana"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Lietojumprogrammas ar ierobežojumiem"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Izvērst lietojumprogr. iestat."</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Šis iestatījums ietekmē visus šī planšetdatora lietotājus."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Valodas maiņa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Fonta lieluma maiņa"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Maksājumi"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Jautāt katru reizi"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vai iestatīt kā jūsu preferenci?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ierobežojumi"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ierobežojumu atcelšana"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Mainīt PIN"</string>
diff --git a/res/values-mn-rMN-nokeys/strings.xml b/res/values-mn-rMN-nokeys/strings.xml
new file mode 100644
index 0000000..e86703e
--- /dev/null
+++ b/res/values-mn-rMN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Аппликешн удирдах"</string>
+</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index fb96882..3b8a5ee 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Холбогдсон"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Холбогдсон (утас байхгүй)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Холбогдсон (медиа байхгүй)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Холбогдсон (утас буюу медиа байхгүй)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Салгагдсан"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Салгаж байна…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Блютүүт холболтын хүсэлт"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"-д холбохын тулд хүрнэ үү."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Та \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"-д холбогдохыг хүсч байна уу?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Утасны лавлахын хүсэлт"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s таны харилцагчид болон ярианы түүхэд хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Дахиж үл асуух"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Дахиж үл асуух"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Зурвасын хүсэлт"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s таны зурвасуудад хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Огноо &amp; цагийн тохиргоо"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Цагийн бүсийг сонгоно уу"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Оруулах төхөөрөмж"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернэт хандалт"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернэт холболтыг хуваалцах"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> медиа аудиогоос салгагдах болно."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> нь гар чөлөөтэй аудиогоос салгагдах болно."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> оруулах төхөөрөмжөөс салгагадах болно."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиод холбогдсон"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Утасны аудид холбогдсон"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл дамжуулах серверт холбогдсон"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Файл дамжуулах серверт холбогдоогүй"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Оруулах төхөөрөмжтэй холбогдсон"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Интернетэд хандахын тулд төхөөрөмжтэй холбогдсон"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Файл дамжуулахад ашиглах"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Оруулахад ашиглах"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Интернет хандалтанд ашиглах"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Док-н тохиргоо"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Аудиод док ашиглах"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Чанга яригч утсаар"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi сүлжээний цэгийг тохируулах"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> зөөврийн Wi-Fi сүлжээний цэг"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"АндройдСүлжээнийЦэг"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Дэлгэц"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дуу"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Утасны хонхны ая"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Идэвхгүйжүүлсэн"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Зөвшөөрсөн"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Хүчилж байна"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Хэрэглэгчид"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Хэрэглэгчид &amp; профайлууд"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Хэрэглэгч буюу профайл нэмэх"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Апп болон контентыг зөвшөөрөх"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Хязгаарлалттай аппликешнүүд"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Аппликешний тохиргоог дэлгэх"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Энэ тохиргоо энэ таблетын бүх хэрэглэгчид хамаарна."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Энэ тохиргоо энэ утасны бүх хэрэглэгчид хамаарна."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Хэл солих"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Фонтын хэмжээг өөрчлөх"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Төлбөр"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Тухай бүрт асуух"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Таны тохируулга болгох уу?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Хязгаарлалтууд"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Хязгаарлалтыг арилгах"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN өөрчлөх"</string>
diff --git a/res/values-ms-rMY-nokeys/strings.xml b/res/values-ms-rMY-nokeys/strings.xml
new file mode 100644
index 0000000..7da53ba
--- /dev/null
+++ b/res/values-ms-rMY-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Urus aplikasi"</string>
+</resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index fe361a1..8958236 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"pantau lokasi"</item>
     <item msgid="5753382310468855812">"awasi lokasi kuasa tinggi"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokasi"</item>
+    <item msgid="8677040780775113033">"Lokasi"</item>
+    <item msgid="1660743989948992916">"Lokasi"</item>
+    <item msgid="8791172739860195290">"Bergetar"</item>
+    <item msgid="383413555642128046">"Baca kenalan"</item>
+    <item msgid="3654594895269697313">"Ubah suai kenalan"</item>
+    <item msgid="7928393476362362538">"Baca log panggilan"</item>
+    <item msgid="6248591205254641116">"Ubah suai log panggilan"</item>
+    <item msgid="6093344633066170692">"Baca kalendar"</item>
+    <item msgid="1334886368750347692">"Ubah suai kalendar"</item>
+    <item msgid="1638204101698708656">"Lokasi"</item>
+    <item msgid="2154671955760380322">"Siarkan pemberitahuan"</item>
+    <item msgid="4282477730595931828">"Lokasi"</item>
+    <item msgid="4891423912898525905">"Hubungi telefon"</item>
+    <item msgid="2623604824935968113">"Baca SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Tulis SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Terima SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Terima SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Terima SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Terima SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Hantar SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Baca SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Tulis SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Ubah suai tetapan"</item>
+    <item msgid="736541391767350377">"Lukiskan di atas"</item>
+    <item msgid="5530815681721654194">"Pemberitahuan akses"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Rakam audio"</item>
+    <item msgid="3493046322001257041">"Mainkan audio"</item>
+    <item msgid="136815868796597058">"Baca papan keratan"</item>
+    <item msgid="5238692940326972503">"Ubah suai papan keratan"</item>
+    <item msgid="5753789168376302997">"Butang media"</item>
+    <item msgid="3265262911688671938">"Tumpuan audio"</item>
+    <item msgid="2098976479485046797">"Kelantangan utama"</item>
+    <item msgid="5660213838861789350">"Kelantangan suara"</item>
+    <item msgid="7983336752371254444">"Kelantangan deringan"</item>
+    <item msgid="7878027809189330917">"Kelantangan media"</item>
+    <item msgid="7260546305036218513">"Kelantangan penggera"</item>
+    <item msgid="9103719301075748925">"Kelantangan pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Kelantangan Bluetooth"</item>
+    <item msgid="4665183401128289653">"Kekal berjaga"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
+    <item msgid="7669257279311110599">"Lokasi"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
     <item msgid="2560532955514699713">"Sederhana"</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index c3c5fc4..6ecfb10 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Bersambung"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Disambungkan (tiada telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Disambungkan (tiada media)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Disambungkan (tiada telefon atau media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Diputuskan sambungan"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutuskan sambungan..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Permintaan sambungan Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Sentuh untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Adakah anda mahu menyambung kepada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Permintaan buku telefon"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s mahu mengakses kenalan dan sejarah panggilan anda. Beri akses kepada %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Jangan tanya lagi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Permintaan mesej"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses mesej anda. Berikan akses kepada %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tetapan tarikh &amp; masa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zon masa"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Peranti input"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Perkongsian sambungan Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari audio bebas tangan."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari peranti input."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Disambungkan ke audio media"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Disambungkan ke audio telefon"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Bersambung ke pelayan pemindahan fail"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak bersambung kepada pelayan pemindahan fail"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Disambungkan ke peranti input"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Sbg ke pranti utk aks Int"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk pemindahan fail"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk input"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gunakan untuk akses Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Tetapan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai telefon pembesar suara"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Sediakan tempat liputan Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> tempat liputan Wi-Fi mudah alih"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"TitikPanasAndroid"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Tambah pengguna atau profil"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Benarkan apl dan kandungan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan sekatan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Kembangkn tetapan utk aplikasi"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Tetapan ini melibatkan semua pengguna pada tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Tukar bahasa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Tukar saiz fon"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pembayaran"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Tanya setiap kali"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Jadikan sebagai pilihan anda?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Sekatan"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Alih keluar sekatan"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Tukar PIN"</string>
diff --git a/res/values-nb-nokeys/strings.xml b/res/values-nb-nokeys/strings.xml
index 2b21240..3b77fb7 100644
--- a/res/values-nb-nokeys/strings.xml
+++ b/res/values-nb-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">"Installerte applikasjoner, hurtigtaster"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Installerte apper, hurtigtaster"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5ed1559..e5c4f2c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Tilkoblet"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Tilkobling (ingen telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tilkoblet (ingen medier)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Tilkoblet (ingen telefon eller media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Frakoblet"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kobler fra…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-tilkoblingsforespørsel"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Trykk for å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Forespørsel for telefonbok"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ønsker adgang til kontaktene og ringeloggen din. Vil du gi %2$s tilgang?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ikke spør igjen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ikke spør igjen"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Meldingsforespørsel"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ønsker adgang til meldingene dine. Vil du gi %2$s tilgang?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Innstillinger for dato og tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Velg tidssone"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inndataenhet"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internett-tilgang"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling av Internett-tilkobling"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra håndfrilyd."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra inndataenheten."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Koblet til medielyd"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Koblet til telefonlyd"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Koblet til tjener for filoverføring"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke koblet til tjener for filoverføring"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Koblet til inndataenhet"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Koblet til enhet for Internett-tilgang"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Bruk til filoverføring"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Bruk for inndata"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Bruk for Internett-tilgang"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Innstillinger for forankringsstasjon"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Bruk forankring til lyd"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurer Wi-Fi-sone"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> flyttbar Wi-Fi-sone"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Brukere"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Brukere og profiler"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Legg til en bruker eller profil"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Tillat apper og innhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apper med begrensninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utvidelsesinnstillinger for appen"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Bytt språk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Endre skriftstørrelse"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalinger"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Spør hver gang"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Angi som foretrukket?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Angi som foretrukket?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Vil du alltid bruke <xliff:g id="APP">%1$s</xliff:g> til berøringsbetaling?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Vil du alltid bruke <xliff:g id="APP_0">%1$s</xliff:g> i stedet for <xliff:g id="APP_1">%2$s</xliff:g> til berøringsbetaling?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Begrensninger"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrensningene"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Endre PIN-koden"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index de64e31..e59d41a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -114,7 +114,7 @@
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Zichtbaar voor alle Bluetooth-apparaten in de buurt"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niet zichtbaar voor andere Bluetooth-apparaten"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Alleen zichtbaar voor gekoppelde apparaten"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Time-out voor zichtbaarheid"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Zichtbaarheid uitstellen"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Spraakkeuze vergrendelen"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gebruik van de Bluetooth-dialer voorkomen wanneer het scherm is vergrendeld"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-apparaten"</string>
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Verbonden"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Gekoppeld (geen telefoon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Gekoppeld (geen media)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Gekoppeld (geen telefoon of media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Verbinding verbroken"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbinding verbreken..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-verbindingsverzoek"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Raak aan om verbinding te maken met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wilt u verbinding maken met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefoonboekverzoek"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wil toegang tot uw contacten en oproepgeschiedenis. Toegang verlenen aan %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Niet meer vragen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Niet meer vragen"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Berichtverzoek"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot uw berichten. Toegang geven aan %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum- en tijdinstellingen"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Een tijdzone kiezen"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Invoerapparaat"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internettoegang"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetverbinding delen"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van audio van medium."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van handsfree audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van het invoerapparaat."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbonden met audio van medium"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbonden met audio van telefoon"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Verbonden met server voor bestandsoverdracht"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niet verbonden met server voor bestandsoverdracht"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Verbonden met invoerapparaat"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Verbonden met apparaat voor internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruiken voor bestandsoverdracht"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gebruiken voor invoer"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gebruik voor internettoegang"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Instellingen voor dockstation"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dockstation gebruiken voor audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als luidsprekertelefoon"</string>
@@ -567,10 +577,10 @@
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Slechte verbindingen vermijden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scannen altijd beschikbaar"</string>
-    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"De locatieservice en andere apps van Google laten scannen naar netwerken, zelfs wanneer wifi is uitgeschakeld"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"De locatieservice en andere apps van Google laten scannen naar netwerken, ook wanneer wifi is uitgeschakeld"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Certificaten installeren"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Als u de nauwkeurigheid van locaties en voor andere doeleinden wilt verbeteren, kunnen Google en andere apps scannen naar netwerken in de buurt, zelfs wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kunnen scannen naar netwerken in de buurt, zelfs wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Als u de nauwkeurigheid van locaties en voor andere doeleinden wilt verbeteren, kunnen Google en andere apps scannen naar netwerken in de buurt, ook wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kunnen scannen naar netwerken in de buurt, ook wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Niet opnieuw weergeven"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"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>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wifi-hotspot instellen"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> draagbare wifi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
@@ -1094,7 +1106,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Uw tablet en persoonlijke gegevens zijn gevoeliger voor aanvallen door apps van onbekende bronnen. U gaat ermee akkoord dat alleen u verantwoordelijk bent voor enige schade aan uw tablet of verlies van gegevens die voortkomen uit het gebruik van deze apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Uw telefoon en persoonlijke gegevens worden door apps van onbekende bronnen gevoeliger voor aanvallen. U gaat ermee akkoord dat alleen u verantwoordelijk bent voor enige schade aan uw telefoon of verlies van gegevens die voortkomen uit het gebruik van deze apps."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Apps verifiëren"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"De installatie van apps die schade kunnen veroorzaken, niet toestaan of eerst waarschuwen"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"De installatie van apps die schade kunnen veroorzaken niet toestaan of eerst waarschuwen"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Geavanceerde instellingen"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Meer opties voor instellingen inschakelen"</string>
     <string name="application_info_label" msgid="5736524913065714880">"App-info"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profielen"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Gebruiker of profiel toevoegen"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Apps en inhoud toestaan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps met beperkingen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Inst. uitbreiden voor app"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Deze instelling is van invloed op alle gebruikers van deze tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Taal wijzigen"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Lettergrootte wijzigen"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalingen"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Altijd vragen"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Instellen als uw voorkeur?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkingen"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Beperkingen verwijderen"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Pincode wijzigen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c304c06..73616c2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Połączony"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Połączono (bez telefonu)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Połączono (bez multimediów)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Połączono (bez telefonu ani multimediów)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Rozłączona"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Rozłączanie..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Żądanie nawiązania połączenia Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Dotknij, aby połączyć się z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Czy chcesz nawiązać połączenie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Żądanie dotyczące książki telefonicznej"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s chce uzyskać dostęp do Twoich kontaktów i historii połączeń. Zezwolić %2$s na dostęp?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nie pytaj ponownie"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nie pytaj ponownie"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Żądanie dostępu do wiadomości"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s chce uzyskać dostęp do Twoich wiadomości. Zezwolić na dostęp?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ustawienia daty i godziny"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Wybierz strefę czasową"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Urządzenie wejściowe"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Dostęp do internetu"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Udostępnianie połączenia internetowego"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od funkcji audio multimediów."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od zestawu głośnomówiącego."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączony od urządzenia wejściowego."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Połączono z funkcją audio multimediów"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Połączono z funkcją audio telefonu"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Połączono z serwerem transferu plików"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Brak połączenia z serwerem transferu plików"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Podłączono do urządzenia wejściowego"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Połączone w celu dostępu do internetu"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Użyj do transferu plików"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Użyj do wprowadzania"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Użyj na potrzeby dostępu do internetu"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ustawienia podstawki"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Używaj podstawki na potrzeby dźwięku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Skonfiguruj hotspot Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Przenośny hotspot Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Punkt dostępu Android"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
@@ -999,7 +1011,7 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Włóż kartę SIM i zrestartuj urządzenie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Połącz się z internetem"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
-    <string name="location_mode_title" msgid="3982009713118421689">"Tryb"</string>
+    <string name="location_mode_title" msgid="3982009713118421689">"Tryb lokalizacji"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Wysoka dokładność"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Oszczędzanie baterii"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Tylko czujniki urządzenia"</string>
@@ -1012,7 +1024,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Tryb lokalizacji"</string>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Określaj lokalizację przez GPS, Wi-Fi i sieci komórkowe"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Określaj lokalizację przez Wi-Fi i sieci komórkowe"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Dokładna lokalizacja przez GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Określaj dokładną lokalizację za pomocą GPS"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Pobieram…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Przez Wi-Fi i sieć komórkową"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Zezwalaj aplikacjom na używanie usługi lokalizacji Google do szybszego określania Twojego położenia. Anonimowe dane o lokalizacji będą zbierane i przesyłane do Google."</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Użytkownicy"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Użytkownicy i profile"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Dodaj użytkownika lub profil"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Zezwól na aplikacje i zawartość"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacje z ograniczeniami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozwiń ustawienia aplikacji"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"To ustawienie obowiązuje wszystkich użytkowników tego tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"To ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmień język"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Zmień rozmiar czcionki"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Płatności"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Zawsze pytaj"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ustawić jako Twoją preferencję?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ograniczenia"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Usuń ograniczenia"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmień PIN"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6f5c824..c514927 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ligado"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ligado (sem telefone)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ligado (sem multimédia)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ligado (sem telefone ou multimédia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desligado"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"A desligar..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Pedido de ligação Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toque para ligar a “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Pretende ligar-se a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitação de lista telefónica"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s pretende aceder aos seus contactos e histórico de chamadas. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Não perguntar novamente"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Não perguntar novamente"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Pedido de mensagem"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s pretende aceder às suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Definições de data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Escolher o fuso horário"</string>
@@ -236,7 +240,7 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"Sem sucesso"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Bem sucedido"</string>
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"As alterações terão efeito ao ligar novamente o cabo USB."</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activar armazenamento em massa USB"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Ativar armazenamento em massa USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Memória de armazenamento USB não montada."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Nenhum cartão SD."</string>
@@ -351,7 +355,7 @@
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Escolher bloq. cópia seg."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de ecrã"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar ecrã de bloq."</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desactivar segurança de padrão, PIN ou palavra-passe"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desativar segurança de padrão, PIN ou palavra-passe"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Escolha um método para bloquear o ecrã"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"Quando o Desbloqueio Através do Rosto não o consegue detetar, como pretende desbloquear?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nenhum"</string>
@@ -373,7 +377,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequência"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Palavra-passe"</string>
-    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueio do ecrã"</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desativar bloqueio do ecrã"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remover palavra-passe de desbloqueio"</string>
@@ -435,7 +439,7 @@
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> conseguirá ler todas as notificações publicadas pelo sistema ou qualquer aplicação instalada, e poderão incluir informações pessoais, como nomes de contactos e o texto de mensagens que lhe foram enviadas. Conseguirá ainda ignorar estas notificações ou tocar nos respetivos botões de ação."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gerir ligações, definir nome e detectabilidade do dispositivo"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partilha da ligação à internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio multimédia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio mãos-livres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do aparelho de entrada."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ligado ao áudio de multimédia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ligado ao áudio do telefone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ligado ao servidor de transferência de ficheiros"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não ligado ao servidor de transferência de ficheiros"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ligado a um dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ligado ao aparelho para acesso à internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para transferência de ficheiros"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acesso à internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Definições da Estação de ancoragem"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizar estação de ancoragem para áudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar ponto de acesso Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Visor"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
@@ -712,7 +724,7 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Definir volume para música e vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarme"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Definições de áudio para a estação de ancoragem acoplada"</string>
-    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Sons dos toques no teclado de marcar"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Sons dos toques no teclado"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sons de toques"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sons de bloqueio do ecrã"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar ao tocar"</string>
@@ -1702,7 +1714,7 @@
     <string name="background_data_dialog_message" msgid="6981661606680941633">"A desativação dos dados de segundo plano permite economizar a bateria e reduzir a utilização de dados. Algumas aplicações podem continuar a utilizar a ligação de dados de segundo plano."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Sinc. autom. de dados da aplicação"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincron. activada"</string>
-    <string name="sync_disabled" msgid="8511659877596511991">"A sincronização está desactivada"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"A sincronização está desativada"</string>
     <string name="sync_error" msgid="5060969083117872149">"Erro de sincron."</string>
     <string name="last_synced" msgid="4242919465367022234">"Última sincronização <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"A sincronizar agora..."</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizadores e perfis"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Adicionar utilizador ou perfil"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicações e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicações com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir defin. da aplicação"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta definição afeta todos os utilizadores deste tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da letra"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagamentos"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Perguntar sempre"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Definir como preferência?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Definir como preferência?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Utilizar sempre <xliff:g id="APP">%1$s</xliff:g> ao tocar e pagar?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Utilizar sempre <xliff:g id="APP_0">%1$s</xliff:g> em vez de <xliff:g id="APP_1">%2$s</xliff:g> ao tocar e pagar?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index f92e1eb..ab6cfa6 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"monitorar local"</item>
     <item msgid="5753382310468855812">"monitorar local de alta potência"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Local"</item>
+    <item msgid="8677040780775113033">"Local"</item>
+    <item msgid="1660743989948992916">"Local"</item>
+    <item msgid="8791172739860195290">"Vibração"</item>
+    <item msgid="383413555642128046">"Ler contatos"</item>
+    <item msgid="3654594895269697313">"Modificar contatos"</item>
+    <item msgid="7928393476362362538">"Ler registro de chamadas"</item>
+    <item msgid="6248591205254641116">"Modificar registro de chamadas"</item>
+    <item msgid="6093344633066170692">"Ler agenda"</item>
+    <item msgid="1334886368750347692">"Modificar agenda"</item>
+    <item msgid="1638204101698708656">"Local"</item>
+    <item msgid="2154671955760380322">"Postar notificação"</item>
+    <item msgid="4282477730595931828">"Local"</item>
+    <item msgid="4891423912898525905">"Chamar telefone"</item>
+    <item msgid="2623604824935968113">"Ler SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Escrever SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Receber SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Receber SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Receber SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Receber SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Enviar SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Ler SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Escrever SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modificar configurações"</item>
+    <item msgid="736541391767350377">"Sobrepor"</item>
+    <item msgid="5530815681721654194">"Acessar notificações"</item>
+    <item msgid="781213371706962767">"Câmera"</item>
+    <item msgid="1720492593061838172">"Gravar áudio"</item>
+    <item msgid="3493046322001257041">"Reproduzir áudio"</item>
+    <item msgid="136815868796597058">"Ler a área de transferência"</item>
+    <item msgid="5238692940326972503">"Modificar a área de transferência"</item>
+    <item msgid="5753789168376302997">"Botões de mídia"</item>
+    <item msgid="3265262911688671938">"Foco de áudio"</item>
+    <item msgid="2098976479485046797">"Volume mestre"</item>
+    <item msgid="5660213838861789350">"Volume da voz"</item>
+    <item msgid="7983336752371254444">"Volume do toque"</item>
+    <item msgid="7878027809189330917">"Volume da mídia"</item>
+    <item msgid="7260546305036218513">"Volume do alarme"</item>
+    <item msgid="9103719301075748925">"Volume da notificação"</item>
+    <item msgid="7025966722295861512">"Volume do Bluetooth"</item>
+    <item msgid="4665183401128289653">"Permanecer ativo"</item>
+    <item msgid="8584357129746649222">"Local"</item>
+    <item msgid="7669257279311110599">"Local"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
     <item msgid="2560532955514699713">"Médio"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9f9f62a..71dfba1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sem telefone)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sem mídia)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sem telefone ou mídia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitação de conexão Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toque para conectar-se a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Deseja conectar-se ao \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitação da lista telefônica"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s deseja acessar seus contatos e o histórico de chamadas. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Não perguntar novamente"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Não perguntar novamente"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Solicitação de mensagem"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configurações de data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartilhamento de conexão à Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio da mídia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio do viva-voz."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do dispositivo de entrada."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do telefone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não está conectado ao servidor de transferência de arquivo"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado ao dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado ao dispositivo para acesso à Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usado para transferência de arquivo"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acesso à Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configurações de dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Usar dock para áudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar ponto de acesso Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Ponto de acesso Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Ponto de acesso Android"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
@@ -1653,7 +1665,7 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Ativar o administrador do dispositivo?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Ativar"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador do dispositivo"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"A ativação deste administrador permitirá que o aplicativo <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"A ativação deste administrador permitirá ao aplicativo <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está ativo e permite que o aplicativo <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sem título"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Geral"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Usuários"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuários e perfis"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Adicionar usuário ou perfil"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicativos e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicativos com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. p/ aplicativo"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuração afeta todos os usuários do tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da fonte"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagamentos"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Perguntar sempre"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Definir como preferência?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 631b16a..dfc640c 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -170,6 +170,8 @@
     <skip />
     <!-- no translation found for bluetooth_connected_no_a2dp (4576188601581440337) -->
     <skip />
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <!-- no translation found for bluetooth_connected_no_headset_no_a2dp (9195757766755553810) -->
     <skip />
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Betg connectà"</string>
@@ -222,7 +224,7 @@
     <skip />
     <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
     <skip />
-    <!-- no translation found for bluetooth_phonebook_request (457033227379858269) -->
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
     <skip />
     <!-- no translation found for bluetooth_pb_acceptance_dialog_text (6555508756987053866) -->
     <skip />
@@ -230,7 +232,7 @@
     <skip />
     <!-- no translation found for bluetooth_pb_remember_choice (2901499974259177202) -->
     <skip />
-    <!-- no translation found for bluetooth_map_request (1541931183213124878) -->
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
     <skip />
     <!-- no translation found for bluetooth_map_acceptance_dialog_text (8712508202081143737) -->
     <skip />
@@ -696,6 +698,8 @@
     <skip />
     <!-- no translation found for bluetooth_profile_pan_nap (8429049285027482959) -->
     <skip />
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
     <skip />
     <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
@@ -720,6 +724,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connectà cun ils parameters audio da las medias"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connectà cun il sistem dad audio dal telefonin"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connectà cun il server da transmissiun da datotecas"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Betg connectà cun il server da transmissiun da datotecas"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connectà cun in apparat d\'endataziun"</string>
     <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
@@ -732,6 +738,8 @@
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilisar per l\'input"</string>
     <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
     <skip />
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Parameters da la basa"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilisar la basa per l\'audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sco telefon ad autpledader"</string>
@@ -1071,6 +1079,8 @@
     <!-- no translation found for wifi_tether_configure_subtext (7957547035983257748) -->
     <skip />
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Visur"</string>
     <!-- no translation found for sound_settings (5534671337768745343) -->
     <skip />
@@ -3124,6 +3134,18 @@
     <skip />
     <!-- no translation found for selinux_status_enforcing (2252703756208463329) -->
     <skip />
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <!-- no translation found for user_settings_title (6151874007858148344) -->
     <skip />
     <!-- no translation found for user_list_title (7937158411137563543) -->
@@ -3214,6 +3236,8 @@
     <skip />
     <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
     <skip />
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <!-- no translation found for global_change_warning (8045013389464294039) -->
     <skip />
     <!-- no translation found for global_change_warning (2461264421590324675) -->
@@ -3224,9 +3248,13 @@
     <skip />
     <!-- no translation found for nfc_payment_settings_title (1121386157283141856) -->
     <skip />
-    <!-- no translation found for nfc_payment_ask (1061129391464251903) -->
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
     <skip />
-    <!-- no translation found for nfc_payment_set_default (1583397933053078296) -->
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
     <skip />
     <!-- no translation found for restriction_settings_title (4233515503765879736) -->
     <skip />
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 4900834..22d9b4e 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"monitorizarea locației"</item>
     <item msgid="5753382310468855812">"monitorizarea localizării cu consum ridicat de energie"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Locație"</item>
+    <item msgid="8677040780775113033">"Locație"</item>
+    <item msgid="1660743989948992916">"Locație"</item>
+    <item msgid="8791172739860195290">"Vibrează"</item>
+    <item msgid="383413555642128046">"Citește agenda"</item>
+    <item msgid="3654594895269697313">"Modifică agenda"</item>
+    <item msgid="7928393476362362538">"Citește jurnalul de apeluri"</item>
+    <item msgid="6248591205254641116">"Modifică jurnalul de apeluri"</item>
+    <item msgid="6093344633066170692">"Citește calendarul"</item>
+    <item msgid="1334886368750347692">"Modifică calendarul"</item>
+    <item msgid="1638204101698708656">"Locație"</item>
+    <item msgid="2154671955760380322">"Postează o notificare"</item>
+    <item msgid="4282477730595931828">"Locație"</item>
+    <item msgid="4891423912898525905">"Apelează un telefon"</item>
+    <item msgid="2623604824935968113">"Citiți mesaje SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Scrieți mesaje SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Primește mesaje SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Primește mesaje SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Primește mesaje SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Primește mesaje SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Trimite mesaje SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Citiți mesaje SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Scrieți mesaje SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modifică setările"</item>
+    <item msgid="736541391767350377">"Desenează deasupra"</item>
+    <item msgid="5530815681721654194">"Accesează notificări"</item>
+    <item msgid="781213371706962767">"Cameră foto"</item>
+    <item msgid="1720492593061838172">"Înregistrează conținut audio"</item>
+    <item msgid="3493046322001257041">"Redă conținut audio"</item>
+    <item msgid="136815868796597058">"Citește clipboardul"</item>
+    <item msgid="5238692940326972503">"Modifică clipboardul"</item>
+    <item msgid="5753789168376302997">"Butoane media"</item>
+    <item msgid="3265262911688671938">"Focalizare audio"</item>
+    <item msgid="2098976479485046797">"Volum principal"</item>
+    <item msgid="5660213838861789350">"Volum voce"</item>
+    <item msgid="7983336752371254444">"Volum sonerie"</item>
+    <item msgid="7878027809189330917">"Volum media"</item>
+    <item msgid="7260546305036218513">"Volum alarmă"</item>
+    <item msgid="9103719301075748925">"Volum notificări"</item>
+    <item msgid="7025966722295861512">"Volum Bluetooth"</item>
+    <item msgid="4665183401128289653">"Păstrare în activitate"</item>
+    <item msgid="8584357129746649222">"Locație"</item>
+    <item msgid="7669257279311110599">"Locație"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
     <item msgid="2560532955514699713">"Medie"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 435ed04..15a3cb6 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectat (fără telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conţ. media)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără tel. sau conţ. media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deconectat"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"În curs de deconectare..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitare de conectare Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Atingeţi pentru a vă conecta la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Doriţi să vă conectaţi la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitare de agendă"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s doreşte să acceseze Agenda dvs. şi istoricul apelurilor. Permiteţi accesul pentru %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nu doresc să fiu întrebat(ă) din nou"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nu doresc să fiu întrebat(ă) din nou"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Cerere mesaj"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s dorește să acceseze mesajele dvs. Oferiți acces pentru %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setări privind data şi ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selectaţi fusul orar"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispozitiv de intrare"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acces internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Distribuirea conexiunii la internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la dispozitivul de intrare."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectat la profilul pentru conţinut media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectat la componenta audio a telefonului"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectat la serverul de transfer de fişiere"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neconectat la serverul de transfer de fişiere"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectat la dispozitivul de intrare"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la disp. pt. acces internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizaţi pentru transferul de fişiere"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizaţi pentru introducere date"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizaţi pentru acces internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setări de andocare"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizaţi dispozitivul de andocare pentru componenta audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurați hotspotul Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Hotspot Wi-Fi portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Afişare"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
@@ -1921,6 +1933,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Adăugați un utilizator/un profil"</string>
@@ -1966,13 +1990,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permiteți aplicații și conținut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicații cu restricții"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Extindeți setările aplicației"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Această setare afectează toţi utilizatorii de pe această tabletă."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Această setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Schimbaţi limba"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Modificaţi dimensiunea fontului"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Plăți"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Întreabă de fiecare dată"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Setați ca preferință?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restricții"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminați restricțiile"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Schimbați codul PIN"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index a6fddc8..64c71cb 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"Отслеживать местоположение"</item>
     <item msgid="5753382310468855812">"контролировать использование энергии при определении местоположения"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Местоположение"</item>
+    <item msgid="8677040780775113033">"Местоположение"</item>
+    <item msgid="1660743989948992916">"Местоположение"</item>
+    <item msgid="8791172739860195290">"Вибросигнал"</item>
+    <item msgid="383413555642128046">"Считывать данные контактов"</item>
+    <item msgid="3654594895269697313">"Изменение контактов"</item>
+    <item msgid="7928393476362362538">"Просмотр списка вызовов"</item>
+    <item msgid="6248591205254641116">"Изменение списка вызовов"</item>
+    <item msgid="6093344633066170692">"Считывать данные календаря"</item>
+    <item msgid="1334886368750347692">"Изменение календаря"</item>
+    <item msgid="1638204101698708656">"Местоположение"</item>
+    <item msgid="2154671955760380322">"Разместить уведомление"</item>
+    <item msgid="4282477730595931828">"Местоположение"</item>
+    <item msgid="4891423912898525905">"Позвонить"</item>
+    <item msgid="2623604824935968113">"Чтение SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Запись SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Получение SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Получение SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Получение SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Получение SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Отправка SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Чтение SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Запись SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Изменение настроек"</item>
+    <item msgid="736541391767350377">"Отображать поверх других элементов"</item>
+    <item msgid="5530815681721654194">"Доступ к уведомлениям"</item>
+    <item msgid="781213371706962767">"Камера"</item>
+    <item msgid="1720492593061838172">"Записать аудио"</item>
+    <item msgid="3493046322001257041">"Воспроизвести аудио"</item>
+    <item msgid="136815868796597058">"Считать из буфера обмена"</item>
+    <item msgid="5238692940326972503">"Изменить буфер обмена"</item>
+    <item msgid="5753789168376302997">"Кнопки мультимедиа"</item>
+    <item msgid="3265262911688671938">"Аудиофокус"</item>
+    <item msgid="2098976479485046797">"Общая громкость"</item>
+    <item msgid="5660213838861789350">"Громкость голоса"</item>
+    <item msgid="7983336752371254444">"Громкость звонка"</item>
+    <item msgid="7878027809189330917">"Громкость мультимедиа"</item>
+    <item msgid="7260546305036218513">"Громкость будильника"</item>
+    <item msgid="9103719301075748925">"Громкость уведомлений"</item>
+    <item msgid="7025966722295861512">"Громкость Bluetooth-устройств"</item>
+    <item msgid="4665183401128289653">"Не отключать"</item>
+    <item msgid="8584357129746649222">"Местоположение"</item>
+    <item msgid="7669257279311110599">"Определение местоположения"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
     <item msgid="2560532955514699713">"Средняя"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cb772b2..5e77c36 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Подключено"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Подключено (кроме HSP/HFP)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Подключено (кроме A2DP)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Подключено (кроме HSP/HFP/A2DP)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Отключено"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Отключение..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запрос на подключение по каналу Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Нажмите, чтобы подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Запрос телефонной книги"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Устройство \"%1$s\" пытается получить доступ к вашим контактам и журналу вызовов. Разрешить доступ для %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Больше не спрашивать"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Больше не спрашивать"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Запрос на доступ к сообщениям"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хочет получить доступ к вашим сообщениям. Предоставить доступ %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки даты и времени"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Выбрать часовой пояс"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Профиль HID"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернет-доступ"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Профиль PAN"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от источника звука."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от гарнитуры."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> отключается от устройства ввода."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Подключено к мультимедийному аудиоустройству"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Подключено к аудиоустройству телефона"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установлено подключение к серверу передачи файлов"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Нет подключения к серверу передачи файлов"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Подключено к устройству ввода"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Используется интернет-подключение другого устройства"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Используется для передачи файлов"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Использовать для ввода"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Использовать для доступа к Интернету"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Настройки док-станции"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Использовать док-станцию для звука"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Для громкой связи"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Настройка точки доступа Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Портативная точка доступа Wi-Fi: <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Хот-спот Android"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
@@ -1046,7 +1058,7 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Загрузка…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберите пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Создайте графический ключ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Выберите ПИН-код"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Введите PIN-код"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Введите новый пароль"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Подтвердите графический ключ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Подтвердите ПИН-код"</string>
@@ -1922,6 +1934,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Отключено"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Только предупреждение"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Блокировка"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Пользователи"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Пользователи и профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Добавить пользователя/профиль"</string>
@@ -1967,13 +1991,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешить приложения и контент"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничениями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Развернуть настр. приложений"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Измените язык"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Измените размер шрифта"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Платежи"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Всегда спрашивать"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Сохранить настройку?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Отменить ограничения"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Изменить PIN-код"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 2ff54cd..2813659 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"sledovať polohu"</item>
     <item msgid="5753382310468855812">"sledovanie polohy s vysokým výkonnom"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Poloha"</item>
+    <item msgid="8677040780775113033">"Poloha"</item>
+    <item msgid="1660743989948992916">"Poloha"</item>
+    <item msgid="8791172739860195290">"Vibrovanie"</item>
+    <item msgid="383413555642128046">"Čítanie kontaktov"</item>
+    <item msgid="3654594895269697313">"Úprava kontaktov"</item>
+    <item msgid="7928393476362362538">"Čítanie denníka hovorov"</item>
+    <item msgid="6248591205254641116">"Úprava denníka hovorov"</item>
+    <item msgid="6093344633066170692">"Čítanie kalendára"</item>
+    <item msgid="1334886368750347692">"Úprava kalendára"</item>
+    <item msgid="1638204101698708656">"Poloha"</item>
+    <item msgid="2154671955760380322">"Upozornenie na príspevok"</item>
+    <item msgid="4282477730595931828">"Poloha"</item>
+    <item msgid="4891423912898525905">"Volanie na telefón"</item>
+    <item msgid="2623604824935968113">"Čítanie SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Písanie SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Príjem SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Príjem SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Príjem SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Príjem SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Odosielanie SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Čítanie SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Písanie SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Úprava nastavení"</item>
+    <item msgid="736541391767350377">"Vykreslenie navrch"</item>
+    <item msgid="5530815681721654194">"Prístup k upozorneniam"</item>
+    <item msgid="781213371706962767">"Fotoaparát"</item>
+    <item msgid="1720492593061838172">"Zaznamenať zvuk"</item>
+    <item msgid="3493046322001257041">"Prehrať zvuk"</item>
+    <item msgid="136815868796597058">"Načítať schránku"</item>
+    <item msgid="5238692940326972503">"Upraviť schránku"</item>
+    <item msgid="5753789168376302997">"Tlačidlá médií"</item>
+    <item msgid="3265262911688671938">"Zameranie zvuku"</item>
+    <item msgid="2098976479485046797">"Hlavná hlasitosť"</item>
+    <item msgid="5660213838861789350">"Hlasitosť hlasu"</item>
+    <item msgid="7983336752371254444">"Hlasitosť zvonenia"</item>
+    <item msgid="7878027809189330917">"Hlasitosť médií"</item>
+    <item msgid="7260546305036218513">"Hlasitosť budíka"</item>
+    <item msgid="9103719301075748925">"Hlasitosť upozornení"</item>
+    <item msgid="7025966722295861512">"Hlasitosť zariadenia Bluetooth"</item>
+    <item msgid="4665183401128289653">"Zakázať režim spánku"</item>
+    <item msgid="8584357129746649222">"Poloha"</item>
+    <item msgid="7669257279311110599">"Poloha"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátka"</item>
     <item msgid="2560532955514699713">"Stredná"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e576f91..1e06c14 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Pripojené"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Pripojené (bez telefónu)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Pripojené (bez média)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Pripojené (bez telefónu alebo média)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojený"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prebieha odpájanie..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Žiadosť o pripojenie zariadenia Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"K zariadeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ sa pripojíte dotykom."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete sa pripojiť k zariadeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Žiadosť telefónneho zoznamu"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Zariadenie %1$s žiada o prístup k vašim kontaktom a histórii hovorov. Povoliť zariadeniu %2$s prístup?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nabudúce sa nepýtať"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nabudúce sa nepýtať"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Požiadavka správy"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zariadenie %1$s chce získať prístup k vašim správam. Chcete zariadeniu %2$s tento prístup umožniť?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavenia dátumu a času"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupné zariadenie"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prístup na Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Zdieľanie pripojenia na Internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky média."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Profil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojený od vstupného zariadenia."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Pripojené ku zvukovému médiu"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Pripojené ku zvuku telefónu"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Pripojené na server pre prenos údajov"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepripojené k serveru pre prenos súborov"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Pripojené na vstupné zariadenie"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pripoj. k zariad. s príst. na Internet"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použiť na prenos súborov"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použiť pre vstup"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použiť na prístup k Internetu"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavenia doku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Použiť zvuk doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ako reproduktor telefónu"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastaviť hotspot siete Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Prenosný hotspot siete Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Zobraziť"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Používatelia"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Používatelia a profily"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Pridať používateľa alebo profil"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Povoliť aplikácie a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikácie s obmedzením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbaliť nastavenia aplikácie"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmeniť jazyk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Zmeniť veľkosť písma"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Platby"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Vždy sa opýtať"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nastaviť ako predvoľbu?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Obmedzenia"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odstrániť obmedzenia"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmeniť kód PIN"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 3fb1977..d91c694 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"spremljanje lokacije"</item>
     <item msgid="5753382310468855812">"nadzor natančno določene lokacije"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokacija"</item>
+    <item msgid="8677040780775113033">"Lokacija"</item>
+    <item msgid="1660743989948992916">"Lokacija"</item>
+    <item msgid="8791172739860195290">"Vibriranje"</item>
+    <item msgid="383413555642128046">"Branje stikov"</item>
+    <item msgid="3654594895269697313">"Spreminjanje stikov"</item>
+    <item msgid="7928393476362362538">"Branje dnevnika klicev"</item>
+    <item msgid="6248591205254641116">"Spreminjanje dnevnika klicev"</item>
+    <item msgid="6093344633066170692">"Branje koledarja"</item>
+    <item msgid="1334886368750347692">"Spreminjanje koledarja"</item>
+    <item msgid="1638204101698708656">"Lokacija"</item>
+    <item msgid="2154671955760380322">"Objava obvestila"</item>
+    <item msgid="4282477730595931828">"Lokacija"</item>
+    <item msgid="4891423912898525905">"Klicanje telefonske številke"</item>
+    <item msgid="2623604824935968113">"Branje sporočil SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Pisanje sporočil SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Pošiljanje sporočil SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Branje sporočil SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Pisanje sporočil SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Spreminjanje nastavitev"</item>
+    <item msgid="736541391767350377">"Vlečenje na vrh"</item>
+    <item msgid="5530815681721654194">"Dostop do obvestil"</item>
+    <item msgid="781213371706962767">"Fotoaparat"</item>
+    <item msgid="1720492593061838172">"Snemanje zvoka"</item>
+    <item msgid="3493046322001257041">"Predvajanje zvoka"</item>
+    <item msgid="136815868796597058">"Preberi odložišče"</item>
+    <item msgid="5238692940326972503">"Spremeni odložišče"</item>
+    <item msgid="5753789168376302997">"Gumbi za predstavnosti"</item>
+    <item msgid="3265262911688671938">"Osredotočenost zvoka"</item>
+    <item msgid="2098976479485046797">"Glavna glasnost"</item>
+    <item msgid="5660213838861789350">"Glasnost glasu"</item>
+    <item msgid="7983336752371254444">"Glasnost zvonjenja"</item>
+    <item msgid="7878027809189330917">"Glasnost predstavnosti"</item>
+    <item msgid="7260546305036218513">"Glasnost alarma"</item>
+    <item msgid="9103719301075748925">"Glasnost obvestila"</item>
+    <item msgid="7025966722295861512">"Glasnost Bluetootha"</item>
+    <item msgid="4665183401128289653">"Ohrani odklenjen zaslon"</item>
+    <item msgid="8584357129746649222">"Lokacija"</item>
+    <item msgid="7669257279311110599">"Lokacija"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednja"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 12bdacb..21fcfc8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Povezava je vzpostavljena"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Povezava vzpostavljena (brez telefona)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Povezava vzpostavljena (brez predstavnosti)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Povezava vzpostavljena (brez telefona ali predstavnosti)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Prekinjena povezava"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prekinjanje povezave ..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Zahteva za povezavo Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Dotaknite se za povezavo z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>E«"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Se želite povezati z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Zahteva za telefonski imenik"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s želi dostop do vaših stikov in zgodovine klicev. Želite dovoliti dostop osebi %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ne vprašaj me več"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne vprašaj me več"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Zahteva za dostop do sporočil"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi dostopati do vaših sporočil. Želite omogočiti dostop za %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum in nastavitve"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izberite časovni pas"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vnosna naprava"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetni dostop"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Skupna raba internetne povezave"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in zvokom nosilca podatkov bo prekinjena."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in prostoročnim zvokom bo prekinjena."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in vnosno napravo bo prekinjena."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezan s profilom za predstavnostni zvok"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezava s profilom za zvok telefona vzpostavljena"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezava s strežnikom za prenos datotek je vzpostavljena"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Povezava s strežnikom za prenos datotek ni vzpostavljena"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Povezava z vnosno napravo je vzpostavljena"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Povezava z napravo za internetni dostop"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uporabi za prenos datotek"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Uporabi za vnos"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Uporabi za dostop do interneta"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavitve stojala"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uporabi stojalo za zvok"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kot zvočnik"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastavitev dostopne točke Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Prenosna dostopna točka Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Uporabniki"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Uporabniki in profili"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Dodajanje uporabnika ali profila"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Omogočanje aplikacij in vsebine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije z omejitvami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Dodatne nastavitve za aplikacijo"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Nastavitev vpliva na vse uporabnike v tem tabličnem računalniku."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nastavitev vpliva na vse uporabnike v tem telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Spremenjen jezik"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Spremenjena velikost pisave"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Plačila"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Vedno vprašaj"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Želite nastaviti kot prednostno?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Omejitve"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odstranitev omejitev"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Sprememba kode PIN"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9262790..457ef88 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Повезано"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Повезано (без телефона)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Повезано (без медија)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Повезано (без телефона или медија)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Веза је прекинута"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Прекидање везе..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Захтев за Bluetooth повезивање"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Додирните да бисте се повезали са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Да ли желите да се повежете са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Захтев за телефонски именик"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s жели да приступи вашим контактима и историји позива. Желите ли да одобрите приступ за %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Не питај поново"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Не питај поново"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Захтев за поруку"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s жели да приступи порукама. Желите ли да одобрите приступ за %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Подешавања датума и времена"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор временске зоне"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Улазни уређај"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Приступ Интернету"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Дељење интернет везе"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g>неће бити повезан на звука медија."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g> неће бити повезан на хендсфри звук."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Уређај  <xliff:g id="DEVICE_NAME">%1$s</xliff:g> неће бити повезан на улазнои уређај."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Повезано са звуком медија"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Повезано са звуком телефона"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Повезано са сервером за пренос датотека"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Није повезано са сервером за пренос датотека"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Повезан са улазним уређајем"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Повез. са уређ. ради приступа Интернету"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Коришћење за пренос датотека"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Користи за улаз"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Користи за приступ Интернету"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Подешавања базне станице"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Коришћење постоља за звук"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Као звучник телефона"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Подеси Wi-Fi хотспот"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> преносни Wi‑Fi хотспот"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Онемогућено"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Омогућено"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Спровођење"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Корисници"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Корисници и профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Додај корисника или профил"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволе за апликације и садржај"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликације са ограничењима"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подешавања апликације"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ово подешавање утиче на све кориснике овомг таблета."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ово подешавање утиче на све кориснике овог телефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промена језика"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Промена величине фонта"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Уплате"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Питај сваки пут"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Желите ли да поставите као жељено подешавање?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничења"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Уклони ограничења"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промени PIN"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b81ee5a..012f747 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ansluten"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ansluten (ingen telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ansluten (inga media)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ansluten (ingen telefon och inga media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Kopplas ifrån"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kopplar ifrån…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Begäran om Bluetooth-anslutning"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Tryck om du vill ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vill du ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonboksbegäran"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s vill ha åtkomst till dina kontakter och din samtalshistorik. Vill du ge %2$s åtkomst?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Fråga inte igen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Fråga inte igen"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Meddelandebegäran"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill ha åtkomst till dina meddelanden. Vill du ge %2$s åtkomst?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Inställningar för datum och tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Välj tidszon"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Indataenhet"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetåtkomst"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Delning av Internetanslutning"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån medialjud."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån indataenheten."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ansluten till medialjud"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ansluten till telefonens ljud"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ansluten till filöverföringsserver"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Inte ansluten till filöverföringsserver"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ansluten till indataenhet"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ansluten för Internetåtkomst"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Använd för filöverföring"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Använd för inmatning"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Använd för Internetåtkomst"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dockningsinställningar"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Använd dockningsstation för ljud"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som högtalartelefon"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurera trådlös surfzon via Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Mobil Wi‑Fi-surfzon med <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Användare"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Användare och profiler"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Lägg till användare eller profil"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Tillåt appar och innehåll"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Appar med begränsningar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utöka appens inställningar"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ändra språk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Ändra teckenstorlek"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalningar"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Fråga varje gång"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vill du ange den här som standard?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Vill du ange den här som standard?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Vill du använda <xliff:g id="APP">%1$s</xliff:g> varje gång du snuddar och betalar?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Vill du använda <xliff:g id="APP_0">%1$s</xliff:g> i stället för <xliff:g id="APP_1">%2$s</xliff:g> varje gång du snuddar och betalar?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Begränsningar"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ta bort begränsningar"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ändra PIN-koden"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 330a867..0be8945 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"fuatilia eneo"</item>
     <item msgid="5753382310468855812">"fuatilia eneo kuu"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Eneo"</item>
+    <item msgid="8677040780775113033">"Eneo"</item>
+    <item msgid="1660743989948992916">"Eneo"</item>
+    <item msgid="8791172739860195290">"Tetema"</item>
+    <item msgid="383413555642128046">"Soma anwani"</item>
+    <item msgid="3654594895269697313">"Rekebisha anwani"</item>
+    <item msgid="7928393476362362538">"soma rajisi ya simu"</item>
+    <item msgid="6248591205254641116">"Rekebisha rajisi ya simu"</item>
+    <item msgid="6093344633066170692">"Soma kalenda"</item>
+    <item msgid="1334886368750347692">"Rekebisha kalenda"</item>
+    <item msgid="1638204101698708656">"Eneo"</item>
+    <item msgid="2154671955760380322">"Chapisha arifa"</item>
+    <item msgid="4282477730595931828">"Eneo"</item>
+    <item msgid="4891423912898525905">"Piga simu"</item>
+    <item msgid="2623604824935968113">"Soma SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Andika SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Pokea SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Pokea SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Pokea SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Pokea SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Tuma SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Soma SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Andika SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Rekebisha mipangilio"</item>
+    <item msgid="736541391767350377">"Chora juu"</item>
+    <item msgid="5530815681721654194">"Fikia arifa"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Rekodi sauti"</item>
+    <item msgid="3493046322001257041">"Cheza sauti"</item>
+    <item msgid="136815868796597058">"Soma ubao klipu"</item>
+    <item msgid="5238692940326972503">"Rekebisha ubao klipu"</item>
+    <item msgid="5753789168376302997">"Vitufe vya media"</item>
+    <item msgid="3265262911688671938">"Kotovu cha sauti"</item>
+    <item msgid="2098976479485046797">"Sauti kuu"</item>
+    <item msgid="5660213838861789350">"Kiwango cha sauti"</item>
+    <item msgid="7983336752371254444">"Sauti ya mlio"</item>
+    <item msgid="7878027809189330917">"Sauti ya media"</item>
+    <item msgid="7260546305036218513">"Sauti ya kengele"</item>
+    <item msgid="9103719301075748925">"Sauti ya arifa"</item>
+    <item msgid="7025966722295861512">"Sauti ya Bluetooth"</item>
+    <item msgid="4665183401128289653">"Kaa chonjo"</item>
+    <item msgid="8584357129746649222">"Eneo"</item>
+    <item msgid="7669257279311110599">"Eneo"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
     <item msgid="2560532955514699713">"Wastani"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 25d9219..667b210 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Umeunganishwa"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Imeunganishwa (hakuna simu)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Imeunganishwa(hakuna vyombo vya habari)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Imeunganishwa(hakuna simu au vyombo vya habari)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Imetenganishwa"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inatenganisha..."</string>
@@ -163,13 +165,15 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Muunganisho wa Bluetooth umeombwa"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Gusa ili kuunganisha kwa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Unataka kuunganishwa kwa\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Ombi la kitabu cha simu"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <!-- String.format failed for translation -->
     <!-- no translation found for bluetooth_pb_acceptance_dialog_text (6555508756987053866) -->
     <skip />
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Usiniulize tena"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Usiniulize tena"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Ombi la ujumbe"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s inataka kufikia ujumbe wako. Ruhusu ufikiaji kwa %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Mipangilio ya tarehe na saa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chagua saa za eneo"</string>
@@ -318,7 +322,7 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"Maelezo ya mtumiaji"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Onyesha maelezo ya wasifu kwenye skrini iliyofungwa"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Maelezo ya wasifu"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"Eneo"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"Kutambua Eneo"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Usalama"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
@@ -471,6 +475,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Kifaa cha kuingiza"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ufikivu wa mtandao"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Kushiriki muunganisho wa tovuti"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya kifaa kisichotumia mikono."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa kifaa cha kuingiza."</string>
@@ -486,6 +492,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Imeunganishwa kwenye sikika ya njia ya mawasiliano"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Imeunganishwa kwenye sauti ya simu"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Imeunganishwa kwenye seva ya kuhamisha faili"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Haijaunganishwa kwenye seva ya kuhamisha faili"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Umeunganishwa kwa kifaa cha kuingiza"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Umeunganishwa kwa kifaa cha ufikia Mtandao"</string>
@@ -495,6 +503,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Tumia kwa hali faili"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Tumia kwa kuingiza"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Tumia kwa ufikiaji mtandao"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Mipangilio ya Gati"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Tumia dock ya sauti"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kama simu ya spika"</string>
@@ -686,6 +696,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Weka intaneti ya Wi-Fi ya kusambazwa"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> intaneti ya Wi-Fi ya kusambazwa"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
@@ -998,11 +1010,11 @@
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Inayookoa betri"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Sensa ya vifaa pekee"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Eneo limezimwa"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Maombi ya hivi karibuni ya eneo"</string>
-    <string name="location_no_recent_apps" msgid="2800907699722178041">"Hakuna programu iliyoomba eneo hivi karibuni"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Maombi ya hivi karibuni ya kutambua eneo"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Hakuna programu iliyotaka kutambua eneo hivi karibuni"</string>
     <string name="location_category_app_settings" msgid="46434611182743486">"Mipangilio ya programu"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Matumizi ya betri ya hali ya juu"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Matumizi ya betri ya hali ya chini"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Haikutumia chaji nyingi"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Hali ya eneo"</string>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Tumia GPS, Wi-Fi na mitandao ya simu kukadiria eneo"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Tumia Wi-Fi na mitandao ya simu kukadiria eneo"</string>
@@ -1914,6 +1926,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Watumiaji"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Watumiaji na wasifu"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Ongeza mtumiaji au wasifu"</string>
@@ -1959,13 +1983,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Ruhusu programu na maudhui"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programu zilizo na vizuizi"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Panua mipangilio ya programu"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Badilisha lugha"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Badilisha ukubwa wa fonti"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Malipo"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Uliza kila wakati"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ungependa kuweka kama mapendeleo yako?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Vikwazo"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ondoa vikwazo"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Badilisha PIN"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index e368db3..977bdef 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"ตำแหน่งจอภาพ"</item>
     <item msgid="5753382310468855812">"ติดตามตำแหน่งโดยใช้พลังงานมาก"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"ตำแหน่ง"</item>
+    <item msgid="8677040780775113033">"ตำแหน่ง"</item>
+    <item msgid="1660743989948992916">"ตำแหน่ง"</item>
+    <item msgid="8791172739860195290">"สั่น"</item>
+    <item msgid="383413555642128046">"อ่านรายชื่อติดต่อ"</item>
+    <item msgid="3654594895269697313">"แก้ไขรายชื่อติดต่อ"</item>
+    <item msgid="7928393476362362538">"อ่านประวัติการโทร"</item>
+    <item msgid="6248591205254641116">"แก้ไขประวัติการโทร"</item>
+    <item msgid="6093344633066170692">"อ่านปฏิทิน"</item>
+    <item msgid="1334886368750347692">"แก้ไขปฏิทิน"</item>
+    <item msgid="1638204101698708656">"ตำแหน่ง"</item>
+    <item msgid="2154671955760380322">"การแจ้งเตือนโพสต์"</item>
+    <item msgid="4282477730595931828">"ตำแหน่ง"</item>
+    <item msgid="4891423912898525905">"โทรเข้าโทรศัพท์"</item>
+    <item msgid="2623604824935968113">"อ่าน SMS/MMS"</item>
+    <item msgid="4420177125221176306">"เขียน SMS/MMS"</item>
+    <item msgid="3986142739951490025">"รับ SMS/MMS"</item>
+    <item msgid="3984213795861739778">"รับ SMS/MMS"</item>
+    <item msgid="3656243523752472788">"รับ SMS/MMS"</item>
+    <item msgid="8105802370238551510">"รับ SMS/MMS"</item>
+    <item msgid="1407766984645388488">"ส่ง SMS/MMS"</item>
+    <item msgid="3527273606643794973">"อ่าน SMS/MMS"</item>
+    <item msgid="4370895547001583812">"เขียน SMS/MMS"</item>
+    <item msgid="4218544235221631789">"แก้ไขการตั้งค่า"</item>
+    <item msgid="736541391767350377">"วาดด้านบน"</item>
+    <item msgid="5530815681721654194">"เข้าถึงการแจ้งเตือน"</item>
+    <item msgid="781213371706962767">"กล้อง"</item>
+    <item msgid="1720492593061838172">"บันทึกเสียง"</item>
+    <item msgid="3493046322001257041">"เล่นเสียง"</item>
+    <item msgid="136815868796597058">"อ่านคลิปบอร์ด"</item>
+    <item msgid="5238692940326972503">"แก้ไขคลิปบอร์ด"</item>
+    <item msgid="5753789168376302997">"ปุ่มสื่อ"</item>
+    <item msgid="3265262911688671938">"โฟกัสอัตโนมัติ"</item>
+    <item msgid="2098976479485046797">"ระดับเสียงหลัก"</item>
+    <item msgid="5660213838861789350">"ระดับเสียงสนทนา"</item>
+    <item msgid="7983336752371254444">"ระดับเสียงเรียกเข้า"</item>
+    <item msgid="7878027809189330917">"ระดับเสียงของสื่อ"</item>
+    <item msgid="7260546305036218513">"ระดับเสียงปลุก"</item>
+    <item msgid="9103719301075748925">"ระดับเสียงของการแจ้งเตือน"</item>
+    <item msgid="7025966722295861512">"ระดับบลูทูธ"</item>
+    <item msgid="4665183401128289653">"ทำงานตลอดเวลา"</item>
+    <item msgid="8584357129746649222">"ตำแหน่ง"</item>
+    <item msgid="7669257279311110599">"ตำแหน่ง"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
     <item msgid="2560532955514699713">"ปานกลาง"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d72d16c..2b1ae0e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"เชื่อมต่อแล้ว"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"เชื่อมต่อแล้ว (ยกเว้นเสียงโทรศัพท์)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"เชื่อมต่อแล้ว (ยกเว้นเสียงสื่อ)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"เชื่อมต่อ (ยกเว้นเสียงโทรศัพท์หรือสื่อ)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"ตัดการเชื่อมต่อ"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"กำลังตัดการเชื่อมต่อ..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ขอการเชื่อมต่อบลูทูธ"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"แตะเพื่อเชื่อมต่อ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"คุณต้องการเชื่อมต่อไปยัง \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" หรือไม่"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"คำขอสมุดโทรศัพท์"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ต้องการเข้าถึงสมุดติดต่อและประวัติการโทรของคุณ อนุญาตให้ %2$s เข้าถึงหรือไม่"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"ไม่ต้องถามอีก"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ไม่ต้องถามอีก"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"คำขอข้อความ"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ต้องการเข้าถึงข้อความของคุณ ให้สิทธิ์เข้าถึงแก่ %2$s ไหม"</string>
     <string name="date_and_time" msgid="4114084177056654663">"การตั้งเวลาและวันที่"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"เลือกเขตเวลา"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"อุปกรณ์อินพุต"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"การเข้าถึงอินเทอร์เน็ต"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"การแบ่งปันการเชื่อมต่ออินเทอร์เน็ต"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงของสื่อ"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงแฮนด์ฟรี"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากอุปกรณ์อินพุต"</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"เชื่อมต่อกับระบบเสียงของสื่อแล้ว"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"เชื่อมต่อกับระบบเสียงของโทรศัพท์แล้ว"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"เชื่อมต่อกับเซิร์ฟเวอร์สำหรับโอนไฟล์แล้ว"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ไม่ได้เชื่อมต่อกับเซิร์ฟเวอร์สำหรับโอนไฟล์"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"เชื่อมต่อกับอุปกรณ์อินพุตแล้ว"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"เชื่อมต่อกับอุปกรณ์สำหรับการเข้าถึงอินเทอร์เน็ต"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ใช้สำหรับการโอนไฟล์"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ใช้สำหรับการป้อนข้อมูล"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ใช้การเข้าถึงอินเทอร์เน็ต"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"การตั้งค่าแท่นชาร์จ"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ใช้แท่นชาร์จสำหรับระบบเสียง"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"เป็นลำโพง"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ตั้งค่า WiFi ฮอตสปอต"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> WiFi ฮอตสปอตแบบพกพา"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้า"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"ปิดใช้งานแล้ว"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"อนุญาต"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"บังคับใช้งาน"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"ผู้ใช้"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ผู้ใช้และโปรไฟล์"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"เพิ่มผู้ใช้หรือโปรไฟล์"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"อนุญาตแอปและเนื้อหา"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"แอปพลิเคชันที่มีข้อจำกัด"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ขยายการตั้งค่าของแอปพลิเคชัน"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"การตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"เปลี่ยนภาษา"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"เปลี่ยนขนาดแบบอักษร"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"การชำระเงิน"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"ถามทุกครั้ง"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"ตั้งเป็นค่ากำหนดของคุณไหม"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"ข้อจำกัด"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"ลบข้อจำกัด"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"เปลี่ยน PIN"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 94a8888..e8c127b 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"subaybayan ang lokasyon"</item>
     <item msgid="5753382310468855812">"subaybayan ang lokasyon na gumagamit ng maraming power"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokasyon"</item>
+    <item msgid="8677040780775113033">"Lokasyon"</item>
+    <item msgid="1660743989948992916">"Lokasyon"</item>
+    <item msgid="8791172739860195290">"Mag-vibrate"</item>
+    <item msgid="383413555642128046">"Magbasa ng mga contact"</item>
+    <item msgid="3654594895269697313">"Baguhin ang mga contact"</item>
+    <item msgid="7928393476362362538">"Basahin ang log ng tawag"</item>
+    <item msgid="6248591205254641116">"Baguhin ang log ng tawag"</item>
+    <item msgid="6093344633066170692">"Magbasa ng kalendaryo"</item>
+    <item msgid="1334886368750347692">"Baguhin ang kalendaryo"</item>
+    <item msgid="1638204101698708656">"Lokasyon"</item>
+    <item msgid="2154671955760380322">"Mag-post ng notification"</item>
+    <item msgid="4282477730595931828">"Lokasyon"</item>
+    <item msgid="4891423912898525905">"Tumawag sa telepono"</item>
+    <item msgid="2623604824935968113">"Magbasa ng SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Magsulat ng SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Magpadala ng SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Magbasa ng SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Magsulat ng SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Baguhin ang mga setting"</item>
+    <item msgid="736541391767350377">"Gumuhit sa tuktok"</item>
+    <item msgid="5530815681721654194">"I-access ang mga notification"</item>
+    <item msgid="781213371706962767">"Camera"</item>
+    <item msgid="1720492593061838172">"I-record ang audio"</item>
+    <item msgid="3493046322001257041">"I-play ang audio"</item>
+    <item msgid="136815868796597058">"Basahin ang clipboard"</item>
+    <item msgid="5238692940326972503">"Baguhin ang clipboard"</item>
+    <item msgid="5753789168376302997">"Mga media button"</item>
+    <item msgid="3265262911688671938">"Focus ng audio"</item>
+    <item msgid="2098976479485046797">"Master volume"</item>
+    <item msgid="5660213838861789350">"Volume ng boses"</item>
+    <item msgid="7983336752371254444">"Volume ng pag-ring"</item>
+    <item msgid="7878027809189330917">"Volume ng media"</item>
+    <item msgid="7260546305036218513">"Volume ng alarm"</item>
+    <item msgid="9103719301075748925">"Volume ng notification"</item>
+    <item msgid="7025966722295861512">"Volume ng Bluetooth"</item>
+    <item msgid="4665183401128289653">"Panatilihing bukas"</item>
+    <item msgid="8584357129746649222">"Lokasyon"</item>
+    <item msgid="7669257279311110599">"Lokasyon"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
     <item msgid="2560532955514699713">"Katamtaman"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 01c0802..50e3fa9 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Konektado"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Nakakonekta (walang telepono)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Nakakonekta (walang media)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Nakakonekta (walang telepono o media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Hindi nakakonekta"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Nadidiskonekta..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Kahilingan sa pagkonekta ng Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Pindutin upang kumonekta sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Nais mo bang kumonekta sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Kahilingan sa phone book"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Nais na i-access ni %1$s ang iyong mga contact at kasaysayan ng tawag. Bigyan ng access si %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Huwag nang tatanungin muli"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Huwag nang tatanungin muli"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Kahilingang mensahe"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Gustong i-access ni %1$s ang iyong mga mensahe. Bigyan ng access si %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Mga setting ng petsa &amp; oras"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pumili ng time zone"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Device sa pag-input"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Access sa internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Pagbabahagi ng koneksyon sa internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Maaalis sa pagkakakonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa audio ng media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Maaalis ang koneksyon ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa handsfree na audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Maaalis sa pagkakakonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa device ng input."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Konektado sa media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Nakakonekta sa audio ng telepono"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Nakakonekta sa server sa paglilipat ng file"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Hindi konektado sa server ng paglipat ng file"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Nakakonekta sa device ng input"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Konektado sa device sa Internet access"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Ginagamit para sa paglilipat ng file"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gamitin para sa input"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gamitin para sa pag-access sa Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Mga Setting ng Dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gumamit ng dock para sa audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bilang speaker phone"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"I-set up ang Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portable na Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Mga User"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Mga user at profile"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Magdagdag ng user o profile"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Payagan ang apps at nilalaman"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Mga application na may mga paghihigpit"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Palawakin ang mga setting para sa application"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Nakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Baguhin ang wika"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Baguhin ang laki ng font"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Mga Pagbabayad"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Itanong palagi"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Itakda bilang iyong kagustuhan?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Mga Paghihigpit"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Alisin ang paghihigpit"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Palitan ang PIN"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 3f72725..06654b5 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"konumu izle"</item>
     <item msgid="5753382310468855812">"yüksek güç tüketen konum hizmetlerini izle"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Konum"</item>
+    <item msgid="8677040780775113033">"Konum"</item>
+    <item msgid="1660743989948992916">"Konum"</item>
+    <item msgid="8791172739860195290">"Titreşim"</item>
+    <item msgid="383413555642128046">"Kişileri oku"</item>
+    <item msgid="3654594895269697313">"Kişileri değiştir"</item>
+    <item msgid="7928393476362362538">"Çağrı günlüğünü oku"</item>
+    <item msgid="6248591205254641116">"Çağrı günlüğünü değiştir"</item>
+    <item msgid="6093344633066170692">"Takvimi oku"</item>
+    <item msgid="1334886368750347692">"Takvimi değiştir"</item>
+    <item msgid="1638204101698708656">"Konum"</item>
+    <item msgid="2154671955760380322">"Bildirim yayınla"</item>
+    <item msgid="4282477730595931828">"Konum"</item>
+    <item msgid="4891423912898525905">"Telefon et"</item>
+    <item msgid="2623604824935968113">"SMS/MMS oku"</item>
+    <item msgid="4420177125221176306">"SMS/MMS yaz"</item>
+    <item msgid="3986142739951490025">"SMS/MMS al"</item>
+    <item msgid="3984213795861739778">"SMS/MMS al"</item>
+    <item msgid="3656243523752472788">"SMS/MMS al"</item>
+    <item msgid="8105802370238551510">"SMS/MMS al"</item>
+    <item msgid="1407766984645388488">"SMS/MMS gönder"</item>
+    <item msgid="3527273606643794973">"SMS/MMS oku"</item>
+    <item msgid="4370895547001583812">"SMS/MMS yaz"</item>
+    <item msgid="4218544235221631789">"Ayarları değiştir"</item>
+    <item msgid="736541391767350377">"Üste çiz"</item>
+    <item msgid="5530815681721654194">"Bildirimlere eriş"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Ses kaydet"</item>
+    <item msgid="3493046322001257041">"Sesi çal"</item>
+    <item msgid="136815868796597058">"Panoyu oku"</item>
+    <item msgid="5238692940326972503">"Panoyu değiştir"</item>
+    <item msgid="5753789168376302997">"Medya düğmeleri"</item>
+    <item msgid="3265262911688671938">"Ses odağı"</item>
+    <item msgid="2098976479485046797">"Ana ses düzeyi"</item>
+    <item msgid="5660213838861789350">"Konuşma sesi düzeyi"</item>
+    <item msgid="7983336752371254444">"Zil sesi düzeyi"</item>
+    <item msgid="7878027809189330917">"Medya sesi düzeyi"</item>
+    <item msgid="7260546305036218513">"Alarm sesi düzeyi"</item>
+    <item msgid="9103719301075748925">"Bildirim sesi düzeyi"</item>
+    <item msgid="7025966722295861512">"Bluetooth ses düzeyi"</item>
+    <item msgid="4665183401128289653">"Uyanık tut"</item>
+    <item msgid="8584357129746649222">"Konum"</item>
+    <item msgid="7669257279311110599">"Konum"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
     <item msgid="2560532955514699713">"Orta"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cac6ce0..cb2c7cc 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Bağlandı"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Bağlandı (telefon yok)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Bağlandı (medya yok)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Bağlandı (telefon veya medya yok)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Bağlantı kesildi"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Bağlantı kesiliyor…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth bağlantısı isteği"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak için dokunun."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak istiyor musunuz?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefon defteri isteği"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s, kişilerinize ve çağrı geçmişinize erişmek istiyor. %2$s uygulamasına erişim izni verilsin mi?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Tekrar sorma"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Tekrar sorma"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"İleti isteği"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, iletilerinize erişmek istiyor. %2$s için erişim izni veriyor musunuz?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tarih ve saat ayarları"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Saat dilimini seçin"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Giriş cihazı"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"İnternet erişimi"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"İnternet bağlantısı paylaşımı"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> medya ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> eller serbest ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> giriş cihazından ayrılacak."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Medya sesine bağlanıldı"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon sesine bağlandı"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Dosya aktarım sunucusuna bağlandı"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Dosya aktarım sunucusuna bağlanmadı"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Giriş cihazına bağlı"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"İnternet erişimi için cihaza bağlandı"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Dosya aktarımı için kullan"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Giriş için kullan"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"İnternet erişimi için kullan"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Yuva Ayarları"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ses öğesi için yuvayı kullan"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Kablosuz hotspot kurulumu yap"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> taşınabilir Kablosuz hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Ortak Erişim Noktası"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
@@ -1331,7 +1343,7 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI araştırma günlüğü özelliğini etkinleştir"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI araştırmayı etkinleştir"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</string>
     <string name="select_runtime_title" msgid="649783802363155346">"Çalışma zamanını seçin"</string>
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Çalışma zamanını seçin"</string>
@@ -1448,7 +1460,7 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlamadan itibaren pil kullanımı"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> pilde"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"Pilde <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"Fişten çekildikten itibaren <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Şarj oluyor"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekran açık"</string>
@@ -1521,7 +1533,7 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"İşlem İstatistikleri"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Meraklısı için, çalışan işlemlerle ilgili istatistikler"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Bellek kullanımı"</string>
-    <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> süreyi kapsayan istatistikler"</string>
+    <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> içindeki istatistikler"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Cihaz belleğinin mevcut durumu: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
     <string name="process_stats_ram_use" msgid="1271366870003042708">"Ortalama RAM kullanımı"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Çalışma süresi"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Kullanıcılar"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Kullanıcılar ve Profiller"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Kullanıcı veya profil ekle"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Uygulamalara ve içeriğe izin ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Kısıtlamalı uygulamalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Uygulama ayarlarını genişlet"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Bu ayar bu tabletteki tüm kullanıcıları etkiler."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Bu ayar bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Dili değiştir"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Yazı tipi boyutunu değiştir"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Ödemeler"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Her zaman sor"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Tercihiniz olarak ayarlansın mı?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Kısıtlamalar"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Kısıtlamaları kaldır"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN\'i değiştir"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8bcde3c..5edd589 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Підключено"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Під’єднано (без телефону)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Під’єднано (без медіа-файлів)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Під’єднано (без телефону чи медіа)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Роз’єднано"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Відключення..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запит на з’єднання Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Торкніться, щоб підключитися до пристрою \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Підключитися до пристрою \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Запит на телефонну книгу"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s хоче отримати доступ до ваших контактів й історії викликів. Надати %2$s доступ?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Не запитувати знову"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Не запитувати знову"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Запит на доступ до повідомлень"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хоче отримати доступ до ваших повідомлень. Надати %2$s доступ?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Налаштування дати та часу"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вибрати часовий пояс"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Пристрій введення"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Доступ до Інтернету"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Надання доступу до Інтернету"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде відключено від аудіоджерела."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде відключено від аудіо гарнітури."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде відключено від пристрою введення."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Підключено до аудіоджерела"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Підключено до звуку телеф."</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Підключ. до сервера передачі файлів"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Не підключ. до сервера передачі файлів"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Підключено до пристрою введ."</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Під’єдн. до пристр. для дост.до Інтерн."</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Викор. для перед. файлів"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Викор. для введ."</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Використовувати для доступу до Інтернету"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Налашт. станц."</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Викор. станц. для зв."</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як пристр.гучн.зв’язку"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Налаштувати точку доступу Wi‑Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Портативна точка доступу Wi‑Fi до мережі <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодія телефону"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Вимкнено"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Дозволено"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Застосовано"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Користувачі"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Користувачі та профілі"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Додати користувача чи профіль"</string>
@@ -1965,13 +1989,17 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи для програм і вмісту"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Програми з обмеженнями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Розгорнути налаштув. програм"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Це налаштування впливає на всіх користувачів цього планшетного ПК."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Це налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змінити мову"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Змінити розмір шрифту"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Платежі"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Запитувати щоразу"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Установити як вибраний?"</string>
+    <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Надавати перевагу?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Завжди використовувати <xliff:g id="APP">%1$s</xliff:g>, щоб натиснути й оплатити?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Завжди використовувати <xliff:g id="APP_0">%1$s</xliff:g>, а не <xliff:g id="APP_1">%2$s</xliff:g>, щоб натиснути й оплатити?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Обмеження"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Зняти обмеження"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Змінити PIN-код"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 73ba861..4fd848c 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"giám sát vị trí"</item>
     <item msgid="5753382310468855812">"theo dõi vị trí dùng điện năng cao"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Vị trí"</item>
+    <item msgid="8677040780775113033">"Vị trí"</item>
+    <item msgid="1660743989948992916">"Vị trí"</item>
+    <item msgid="8791172739860195290">"Rung"</item>
+    <item msgid="383413555642128046">"Đọc danh sách liên hệ"</item>
+    <item msgid="3654594895269697313">"Sửa đổi danh sách liên hệ"</item>
+    <item msgid="7928393476362362538">"Đọc nhật ký cuộc gọi"</item>
+    <item msgid="6248591205254641116">"Sửa đổi nhật ký cuộc gọi"</item>
+    <item msgid="6093344633066170692">"Đọc lịch"</item>
+    <item msgid="1334886368750347692">"Sửa đổi lịch"</item>
+    <item msgid="1638204101698708656">"Vị trí"</item>
+    <item msgid="2154671955760380322">"Đăng thông báo"</item>
+    <item msgid="4282477730595931828">"Vị trí"</item>
+    <item msgid="4891423912898525905">"Gọi điện thoại"</item>
+    <item msgid="2623604824935968113">"Đọc SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Viết SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Nhận SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Nhận SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Nhận SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Nhận SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Gửi SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Đọc SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Viết SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Sửa đổi cài đặt"</item>
+    <item msgid="736541391767350377">"Vẽ lên trên"</item>
+    <item msgid="5530815681721654194">"Truy cập thông báo"</item>
+    <item msgid="781213371706962767">"Máy ảnh"</item>
+    <item msgid="1720492593061838172">"Ghi âm"</item>
+    <item msgid="3493046322001257041">"Phát âm thanh"</item>
+    <item msgid="136815868796597058">"Đọc khay nhớ tạm"</item>
+    <item msgid="5238692940326972503">"Sửa đổi khay nhớ tạm"</item>
+    <item msgid="5753789168376302997">"Các nút phương tiện"</item>
+    <item msgid="3265262911688671938">"Tập trung âm thanh"</item>
+    <item msgid="2098976479485046797">"Âm lượng chính"</item>
+    <item msgid="5660213838861789350">"Âm lượng thoại"</item>
+    <item msgid="7983336752371254444">"Âm lượng chuông"</item>
+    <item msgid="7878027809189330917">"Âm lượng phương tiện"</item>
+    <item msgid="7260546305036218513">"Âm lượng báo thức"</item>
+    <item msgid="9103719301075748925">"Âm lượng thông báo"</item>
+    <item msgid="7025966722295861512">"Âm lượng bluetooth"</item>
+    <item msgid="4665183401128289653">"Không khóa màn hình"</item>
+    <item msgid="8584357129746649222">"Vị trí"</item>
+    <item msgid="7669257279311110599">"Vị trí"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
     <item msgid="2560532955514699713">"Trung bình"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 41afc10..713857f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Đã kết nối"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Đã kết nối (không có điện thoại)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Đã kết nối (không có phương tiện)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Đã k.nối (kg có ĐT hoặc p.tiện nào)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Đã ngắt kết nối"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Đang ngắt kết nối…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Yêu cầu kết nối Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Chạm để kết nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Bạn có muốn kết nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" không?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Yêu cầu danh bạ"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s muốn truy cập danh bạ và lịch sử cuộc gọi của bạn. Cấp quyền truy cập cho %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Không hỏi lại"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Không hỏi lại"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Yêu cầu cấp quyền truy cập tin nhắn"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s muốn truy cập tin nhắn của bạn. Bạn có muốn cấp quyền truy cập cho %2$s không?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Cài đặt ngày &amp; giờ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chọn múi giờ"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Thiết bị đầu vào"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Truy cập Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Chia sẻ kết nối internet"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh phương tiện."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh thiết bị rảnh tay."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi thiết bị nhập."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Đã kết nối với âm thanh phương tiện"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Đã kết nối với âm thanh điện thoại"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Đã kết nối với máy chủ chuyển tệp"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Chưa kết nối với máy chủ chuyển tệp"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Đã kết nối với thiết bị nhập"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Đã kết nối với thiết bị"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sử dụng để chuyển tệp"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Sử dụng để nhập"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sử dụng để truy cập Internet"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Cài đặt Đế"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Sử dụng đế cho âm thanh"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Làm loa ngoài"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Thiết lập điểm phát sóng Wi‑Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Điểm phát sóng Wi‑Fi di động <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nhạc chuông điện thoại"</string>
@@ -1920,6 +1932,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Người dùng"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Người dùng và tiểu sử"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Thêm người dùng hoặc tiểu sử"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Cho phép ứng dụng và nội dung"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Ứng dụng có hạn chế"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Mở rộng cài đặt cho ứng dụng"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Cài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Thay đổi ngôn ngữ"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Thay đổi cỡ chữ"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Thanh toán"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Luôn hỏi"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Đặt làm tùy chọn của bạn?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Hạn chế"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Xóa các hạn chế"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Thay đổi PIN"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index e4d360c..0deecf5 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"监测位置"</item>
     <item msgid="5753382310468855812">"监控高电耗位置信息服务"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置"</item>
+    <item msgid="8677040780775113033">"位置"</item>
+    <item msgid="1660743989948992916">"位置"</item>
+    <item msgid="8791172739860195290">"振动"</item>
+    <item msgid="383413555642128046">"读取联系人"</item>
+    <item msgid="3654594895269697313">"修改联系人"</item>
+    <item msgid="7928393476362362538">"读取通话记录"</item>
+    <item msgid="6248591205254641116">"修改通话记录"</item>
+    <item msgid="6093344633066170692">"读取日历"</item>
+    <item msgid="1334886368750347692">"修改日历"</item>
+    <item msgid="1638204101698708656">"位置"</item>
+    <item msgid="2154671955760380322">"发布通知"</item>
+    <item msgid="4282477730595931828">"位置"</item>
+    <item msgid="4891423912898525905">"拨打电话"</item>
+    <item msgid="2623604824935968113">"读取短信/彩信"</item>
+    <item msgid="4420177125221176306">"编写短信/彩信"</item>
+    <item msgid="3986142739951490025">"接收短信/彩信"</item>
+    <item msgid="3984213795861739778">"接收短信/彩信"</item>
+    <item msgid="3656243523752472788">"接收短信/彩信"</item>
+    <item msgid="8105802370238551510">"接收短信/彩信"</item>
+    <item msgid="1407766984645388488">"发送短信/彩信"</item>
+    <item msgid="3527273606643794973">"读取短信/彩信"</item>
+    <item msgid="4370895547001583812">"编写短信/彩信"</item>
+    <item msgid="4218544235221631789">"修改设置"</item>
+    <item msgid="736541391767350377">"在顶部绘制"</item>
+    <item msgid="5530815681721654194">"访问通知"</item>
+    <item msgid="781213371706962767">"相机"</item>
+    <item msgid="1720492593061838172">"录制音频"</item>
+    <item msgid="3493046322001257041">"播放音频"</item>
+    <item msgid="136815868796597058">"读取剪贴板内容"</item>
+    <item msgid="5238692940326972503">"修改剪贴板内容"</item>
+    <item msgid="5753789168376302997">"媒体按钮"</item>
+    <item msgid="3265262911688671938">"音频焦点"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"语音音量"</item>
+    <item msgid="7983336752371254444">"铃声音量"</item>
+    <item msgid="7878027809189330917">"媒体音量"</item>
+    <item msgid="7260546305036218513">"闹钟音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"蓝牙音量"</item>
+    <item msgid="4665183401128289653">"保持唤醒状态"</item>
+    <item msgid="8584357129746649222">"位置"</item>
+    <item msgid="7669257279311110599">"位置信息"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b76228a..97db012 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知错误"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"电量低"</string>
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"让附近所有的蓝牙设备均可检测到(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"让附近所有的蓝牙设备均可检测到"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不让其他蓝牙设备检测到"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"仅让已配对的设备检测到"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"附近所有蓝牙设备均可检测到此设备(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"附近所有蓝牙设备均可检测到此设备"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"其他蓝牙设备检测不到此设备"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"已配对的设备可检测到此设备"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"检测超时设置"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"锁定语音拨号"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"屏幕锁定时停止使用蓝牙拨号器"</string>
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"已连接"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已连接(无手机)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已连接(无媒体)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已连接(没有手机或媒体信号)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"已断开连接"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在断开连接..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"蓝牙连接请求"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"触摸可连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”。"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"要连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”吗?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"电话簿请求"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s想访问您的联系人信息和通话记录。要向%2$s授予访问权限吗?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"不要再询问"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"下次不再询问"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"消息请求"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"“%1$s”想要查看您的消息。要向“%2$s”授予权限吗?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"选择时区"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"输入设备"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"互联网访问"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"互联网连接共享"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与媒体音频断开连接。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与免提音频断开连接。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与输入设备断开连接。"</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已连接到媒体音频"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已连接到手机音频"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已连接到文件传输服务器"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未连接到文件传输服务器"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已连接到输入设备"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"连接到设备以访问互联网"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用于文件传输"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用于输入"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用于访问互联网"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"基座设置"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"将基座用于音频"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"将基座用作免提电话"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"设置 WLAN 热点"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>便携式 WLAN 热点"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 热点"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
@@ -1001,7 +1013,7 @@
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"准确度高"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"节省电池电量"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"耗电量低"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"仅使用设备传感器"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置信息服务已关闭"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置信息请求"</string>
@@ -1609,7 +1621,7 @@
     <string name="trusted_credentials" msgid="4266945289534242402">"受信任的凭据"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"显示受信任的 CA 证书"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"存储类型"</string>
-    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"支持硬件"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬件支持"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"仅限软件"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"绘制您的解锁图案"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您需要绘制解锁图案,以确认凭据安装操作。"</string>
@@ -1920,6 +1932,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"许可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"执行中"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
     <string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"添加用户或个人资料"</string>
@@ -1965,13 +1989,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"允许应用和内容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限应用"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展开应用设置"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"此设置会影响这台平板电脑上的所有用户。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"此设置会影响这部手机上的所有用户。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"更改语言"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"更改字体大小"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"付款"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"每次都询问"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"要设为您的偏好设置吗?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"取消限制"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改 PIN 码"</string>
diff --git a/res/values-zh-rHK-nokeys/strings.xml b/res/values-zh-rHK-nokeys/strings.xml
new file mode 100644
index 0000000..a384b30
--- /dev/null
+++ b/res/values-zh-rHK-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"管理應用程式"</string>
+</resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index c7e56e6..e38952c 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"監控位置"</item>
     <item msgid="5753382310468855812">"監控高功率位置"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置"</item>
+    <item msgid="8677040780775113033">"位置"</item>
+    <item msgid="1660743989948992916">"位置"</item>
+    <item msgid="8791172739860195290">"震動"</item>
+    <item msgid="383413555642128046">"讀取通訊錄"</item>
+    <item msgid="3654594895269697313">"修改通訊錄"</item>
+    <item msgid="7928393476362362538">"讀取通話記錄"</item>
+    <item msgid="6248591205254641116">"修改通話記錄"</item>
+    <item msgid="6093344633066170692">"讀取日曆"</item>
+    <item msgid="1334886368750347692">"修改日曆"</item>
+    <item msgid="1638204101698708656">"位置"</item>
+    <item msgid="2154671955760380322">"發佈通知"</item>
+    <item msgid="4282477730595931828">"位置"</item>
+    <item msgid="4891423912898525905">"撥打電話"</item>
+    <item msgid="2623604824935968113">"讀取 SMS/MMS"</item>
+    <item msgid="4420177125221176306">"寫入 SMS/MMS"</item>
+    <item msgid="3986142739951490025">"接收 SMS/MMS"</item>
+    <item msgid="3984213795861739778">"接收 SMS/MMS"</item>
+    <item msgid="3656243523752472788">"接收 SMS/MMS"</item>
+    <item msgid="8105802370238551510">"接收 SMS/MMS"</item>
+    <item msgid="1407766984645388488">"傳送 SMS/MMS"</item>
+    <item msgid="3527273606643794973">"讀取 SMS/MMS"</item>
+    <item msgid="4370895547001583812">"寫入 SMS/MMS"</item>
+    <item msgid="4218544235221631789">"修改設定"</item>
+    <item msgid="736541391767350377">"在上面繪圖"</item>
+    <item msgid="5530815681721654194">"存取通知"</item>
+    <item msgid="781213371706962767">"相機"</item>
+    <item msgid="1720492593061838172">"錄製音效"</item>
+    <item msgid="3493046322001257041">"播放音效"</item>
+    <item msgid="136815868796597058">"讀取剪貼簿"</item>
+    <item msgid="5238692940326972503">"修改剪貼簿"</item>
+    <item msgid="5753789168376302997">"媒體按鈕"</item>
+    <item msgid="3265262911688671938">"音頻焦點"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"語音音量"</item>
+    <item msgid="7983336752371254444">"鈴聲音量"</item>
+    <item msgid="7878027809189330917">"媒體音量"</item>
+    <item msgid="7260546305036218513">"鬧鐘音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"藍牙音量"</item>
+    <item msgid="4665183401128289653">"保持啟用"</item>
+    <item msgid="8584357129746649222">"位置"</item>
+    <item msgid="7669257279311110599">"位置"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4b05de1..8cfd477 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"已連結"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已連線(無手機)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在中斷連線..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"藍牙連線要求"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"輕觸即可連接「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"您要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"電話簿要求"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s 想存取您的通訊錄和通話記錄。要授予 %2$s 存取權嗎?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"不要再詢問"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"不要再詢問"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"訊息要求"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 想存取您的訊息,要授予 %2$s 存取權嗎?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期與時間設定"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"輸入裝置"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"互聯網連線"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"互聯網連線分享"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"即將中斷「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」與媒體音頻的連線。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"即將中斷「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」與免提聽筒音頻的連線。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"即將中斷「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」與輸入裝置的連線。"</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已連接媒體音頻裝置"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已連接手機耳機"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線至檔案傳輸伺服器"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未連線至檔案傳輸伺服器"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已連線至輸入裝置"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"已連線至裝置並取得互聯網連線"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用於傳輸檔案"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用於輸入"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用於上網"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"座架設定"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"使用座架播放音頻"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"作為手機揚聲器"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"設定 Wi-Fi 熱點"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> 可攜式 Wi-Fi 熱點"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 無線基地台"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
@@ -1924,6 +1936,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"用戶"</string>
     <string name="user_list_title" msgid="7937158411137563543">"用戶和個人檔案"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"新增用戶或個人檔案"</string>
@@ -1969,13 +1993,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受到限制的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"這項設定會影響這部平板電腦的所有用戶。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"這項設定會影響這部手機的所有用戶。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"更改語言"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"更改字型大小"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"付款"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"每次都詢問"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"設為您的喜好設定?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"移除限制"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改 PIN 碼"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 784d9cf..e92935c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -281,10 +281,51 @@
     <item msgid="26109888160231211">"監控位置"</item>
     <item msgid="5753382310468855812">"監控高耗電定位功能"</item>
   </string-array>
-    <!-- no translation found for app_ops_labels:14 (2623604824935968113) -->
-    <!-- no translation found for app_ops_labels:15 (4420177125221176306) -->
-    <!-- no translation found for app_ops_labels:21 (3527273606643794973) -->
-    <!-- no translation found for app_ops_labels:22 (4370895547001583812) -->
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置"</item>
+    <item msgid="8677040780775113033">"位置"</item>
+    <item msgid="1660743989948992916">"位置"</item>
+    <item msgid="8791172739860195290">"震動"</item>
+    <item msgid="383413555642128046">"讀取聯絡人資料"</item>
+    <item msgid="3654594895269697313">"修改聯絡人資料"</item>
+    <item msgid="7928393476362362538">"讀取通話紀錄"</item>
+    <item msgid="6248591205254641116">"修改通話紀錄"</item>
+    <item msgid="6093344633066170692">"讀取日曆"</item>
+    <item msgid="1334886368750347692">"修改日曆"</item>
+    <item msgid="1638204101698708656">"位置"</item>
+    <item msgid="2154671955760380322">"發佈通知"</item>
+    <item msgid="4282477730595931828">"位置"</item>
+    <item msgid="4891423912898525905">"撥打電話"</item>
+    <item msgid="2623604824935968113">"讀取簡訊/MMS"</item>
+    <item msgid="4420177125221176306">"寫入簡訊/MMS"</item>
+    <item msgid="3986142739951490025">"接收 SMS/MMS"</item>
+    <item msgid="3984213795861739778">"接收 SMS/MMS"</item>
+    <item msgid="3656243523752472788">"接收 SMS/MMS"</item>
+    <item msgid="8105802370238551510">"接收 SMS/MMS"</item>
+    <item msgid="1407766984645388488">"傳送 SMS/MMS"</item>
+    <item msgid="3527273606643794973">"讀取簡訊/MMS"</item>
+    <item msgid="4370895547001583812">"寫入簡訊/MMS"</item>
+    <item msgid="4218544235221631789">"修改設定"</item>
+    <item msgid="736541391767350377">"在最上層繪圖"</item>
+    <item msgid="5530815681721654194">"存取通知"</item>
+    <item msgid="781213371706962767">"相機"</item>
+    <item msgid="1720492593061838172">"錄音"</item>
+    <item msgid="3493046322001257041">"播放音訊"</item>
+    <item msgid="136815868796597058">"讀取剪貼簿"</item>
+    <item msgid="5238692940326972503">"修改剪貼簿"</item>
+    <item msgid="5753789168376302997">"媒體按鈕"</item>
+    <item msgid="3265262911688671938">"音訊焦點"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"語音音量"</item>
+    <item msgid="7983336752371254444">"鈴聲音量"</item>
+    <item msgid="7878027809189330917">"媒體音量"</item>
+    <item msgid="7260546305036218513">"鬧鐘音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"藍牙音量"</item>
+    <item msgid="4665183401128289653">"停用休眠"</item>
+    <item msgid="8584357129746649222">"定位"</item>
+    <item msgid="7669257279311110599">"定位"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ad61e7d..1f6b38f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"已連線"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已連線 (無手機音訊)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體音訊)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體音訊)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在中斷連線…"</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"藍牙連線要求"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"輕觸即可連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"您要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎?"</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"電話簿要求"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s 想存取您的通訊錄和通話紀錄。要將存取權授予 %2$s 嗎?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"不要再詢問"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"不要再詢問"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"訊息要求"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 要求存取您的訊息。要將存取權授予 %2$s 嗎?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期與時間設定"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"輸入裝置"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"網際網路連線"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"網際網路連線分享"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與媒體音訊的連線。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與免持聽筒音訊的連線。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與輸入裝置的連線。"</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"連接至媒體音訊"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"連接至電話音訊"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線到檔案傳輸伺服器"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"不要連線到檔案傳輸伺服器"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已連線到輸入裝置"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"已連線至裝置並取得網際網路存取權"</string>
@@ -503,6 +511,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用於傳輸檔案"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用於輸入"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用於網際網路連線"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"座架設定"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"使用座架播放音訊"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"當成手機喇叭"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"設定 Wi-Fi 無線基地台"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> 可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 無線基地台"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
@@ -1924,6 +1936,18 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"使用者"</string>
     <string name="user_list_title" msgid="7937158411137563543">"使用者和個人資料"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"新增使用者或個人資料"</string>
@@ -1969,13 +1993,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"這項設定會影響這台平板電腦的所有使用者。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"這項設定會影響這支手機的所有使用者。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"變更語言"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"變更字型大小"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"付款"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"每次都詢問"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"設為您的偏好設定?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"移除限制"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"變更 PIN 碼"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1a109a6..5d2e797 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -38,7 +38,7 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Cisha i-SMS phezulu kwe-IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Kudingeka ukuthi kuvulwe ukubhaliswa kwe-IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Kudingeka ukuthi kucinywe ukubhaliswa kwe-IMS"</string>
-    <string name="lte_ram_dump_on" msgid="8568568019520172177">"Khanyisa i-lte ram dump"</string>
+    <string name="lte_ram_dump_on" msgid="8568568019520172177">"Vula i-lte ram dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Cima i-lte ram dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Buka incwadi yekheli le-SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Buka Izinombolo Zokudayela Okungaguquki"</string>
@@ -133,6 +133,8 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ixhunyiwe"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ixhunyiwe (ayikho ifoni)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ixhunyiwe (ayikho imidiya)"</string>
+    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
+    <skip />
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ixhunyiwe (ayikho ifoni noma imidiya)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ayixhunyiwe"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inqamula uxhumano kwi-inthanethi..."</string>
@@ -163,11 +165,13 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Isicelo sohleloxhumano lwe-Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Thinta ukuxhumana ku \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Uyafuna ukuxhuma ku \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
-    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Isicelo sebhuku lefoni"</string>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"I-%1$s ifuna ukufinyelela kothintana nabo nomlando wekholi. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ungabuzi futhi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ungabuzi futhi"</string>
-    <string name="bluetooth_map_request" msgid="1541931183213124878">"Isicelo somlayezo"</string>
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"I-%1$s ifuna ukufinyelela kumilayezo yakho. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Usuku nezilungiselelo zesikhathi"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Khetha isikhathi sendawo"</string>
@@ -479,6 +483,8 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Idivaysi yokufakwayo"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ukufinyelela i-Inthanethi"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ukwabelana ngoxhumano lwe-Inthanethi"</string>
+    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
+    <skip />
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingeke ixhumeke kumsindo wemidiya."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kumsindo wehendsfri."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kwidivaysi yokufakwayo."</string>
@@ -494,6 +500,8 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ixhume emsindweni wemidiya"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ixhunywe kumsindo wefoni"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ixhunywe kwiseva yokudlulisa ifayela"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
+    <skip />
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ayixhunyiwe kwiseva sokudlulisa ifayela"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ixhunywe kwidivaysi yokufakwayo"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ixhunyiwe kwidivaysi yokufinyelela kwi-Inthanethi"</string>
@@ -503,13 +511,15 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sebenziselwa ukudlulisa ifayela"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Isetshenziselwa okufakwayo"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sebenzisa ukufinyelela i-Inthanethi"</string>
+    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Izilungiselelo zokudokha"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Sebenzisa ukubeka ingxenye komsindo"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Ukubonisa okungenazintambo"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ukuze ubone amadivayisi, khanyisa ukubonisa okungenazintambo."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ukuze ubone amadivayisi, vula ukubonisa okungenazintambo."</string>
     <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Ukubonisa okungenazintambo kukhutshaziwe ngoba i-Wi-Fi ivaliwe."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Sesha ukubonisa"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Iyasesha…"</string>
@@ -694,6 +704,8 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Setha i-Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> Wi-Fi hotspot ephathekayo"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Indawo ye-Android"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
@@ -1212,7 +1224,7 @@
     <string name="app_ops_running" msgid="7706949900637284122">"Sebenzayo"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ayikaze yasetshenziswa)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ukusetshensiswa kwesitoreji"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"Buka okokulonda okusetshenziswa izinsiza"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"Buka isitoreji esisetshenziswa izinhlelo zokusebenza"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Amasevisi asebenzayo"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Buka futhi ulawule amasevisi  asebenzayo okwamanje"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Iqalisa phansi"</string>
@@ -1636,7 +1648,7 @@
     <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Yenza isipele &amp; usethe kabusha"</string>
     <string name="privacy_settings_title" msgid="4856282165773594890">"Yenza isipele &amp; usethe kabusha"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Isipele &amp; buyisela esimweni"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Isipele ukubuyiselwa"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Idatha yomuntu siqu"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sekela ngokulondoloza idatha yami"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sekela ngokulondoloza idatha yohlelo lokusebenza, amaphasiwedi e-Wi-Fi, nezinye izilungiselelo kwumaseva we-Google"</string>
@@ -1927,6 +1939,18 @@
     <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>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
     <string name="user_settings_title" msgid="6151874007858148344">"Abasebenzisi"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Abasebenzisi namaphrofayela"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Engeza umsebenzisi noma iphrofayela"</string>
@@ -1972,13 +1996,21 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Vumela izinhlelo zokusebenza nokuqukethwe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Izinhlelo zokusebenza ezinomkhawulo"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Nweba izilungiselelo zohlelo lokusebenza"</string>
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Lesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Shintsha ulimi"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Shintsha usayizi wefonti"</string>
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Izinkokhelo"</string>
-    <string name="nfc_payment_ask" msgid="1061129391464251903">"Buza ngaso sonke isikhathi"</string>
-    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Setha njengokuncanyelwayo kwakho?"</string>
+    <!-- no translation found for nfc_payment_no_apps (5518479703188056016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (5427393822785989090) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (5642684106041605080) -->
+    <skip />
     <string name="restriction_settings_title" msgid="4233515503765879736">"Izinciphiso"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Susa izinciphiso"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Shintsha i-PIN"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6529c6e..bf697d6 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -46,6 +46,7 @@
     <dimen name="divider_height">3dip</dimen>
     <dimen name="divider_margin_top">6dip</dimen>
     <dimen name="divider_margin_bottom">7dip</dimen>
+    <dimen name="vert_divider_width">1dip</dimen>
 
     <!--  Size of icons in the top-level of settings  -->
     <dimen name="header_icon_width">28dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8ffa17f..75027a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -276,6 +276,8 @@
     <string name="bluetooth_connected_no_headset">Connected (no phone)</string>
     <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
     <string name="bluetooth_connected_no_a2dp">Connected (no media)</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_map">Connected (no message access)</string>
     <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
     <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string>
     <!-- Bluetooth settings.  Message when a device is disconnected -->
@@ -349,7 +351,7 @@
     <string name="bluetooth_connection_dialog_text">"Do you want to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string>
 
     <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
-    <string name="bluetooth_phonebook_request">"Phone book request"</string>
+    <string name="bluetooth_phonebook_request">"Phone book access request"</string>
 
     <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_pb_acceptance_dialog_text">%1$s wants to access your contacts and call history. Give access to %2$s?</string>
@@ -360,7 +362,7 @@
     <string name="bluetooth_pb_remember_choice">Don\'t ask again</string>
 
     <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
-    <string name="bluetooth_map_request">"Message request"</string>
+    <string name="bluetooth_map_request">"Message access request"</string>
 
     <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_map_acceptance_dialog_text">%1$s wants to access your messages. Give access to %2$s?</string>
@@ -1147,6 +1149,8 @@
     <string name="bluetooth_profile_pan">Internet access</string>
     <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40]-->
     <string name="bluetooth_profile_pan_nap">Internet connection sharing</string>
+    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the map profile. -->
+    <string name="bluetooth_profile_map">Message Access</string>
 
     <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
     <string name="bluetooth_disconnect_a2dp_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from media audio.</string>
@@ -1179,6 +1183,8 @@
     <string name="bluetooth_headset_profile_summary_connected">Connected to phone audio</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
     <string name="bluetooth_opp_profile_summary_connected">Connected to file transfer server</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+    <string name="bluetooth_map_profile_summary_connected">Connected to map</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
     <string name="bluetooth_opp_profile_summary_not_connected">Not connected to file transfer server</string>
     <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
@@ -1202,6 +1208,8 @@
          for the PAN checkbox preference that describes how checking it
          will set the PAN profile as preferred. -->
     <string name="bluetooth_pan_profile_summary_use_for">Use for Internet access</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+    <string name="bluetooth_map_profile_summary_use_for">Use for map</string>
 
     <!-- Bluetooth settings.  Dock Setting Title -->
     <string name="bluetooth_dock_settings">Dock Settings</string>
@@ -1732,6 +1740,7 @@
     <!-- Sound and alerts settings -->
     <skip/>
     <!-- Main Settings screen setting option name to go into the display settings screen -->
+    <string name="home_settings">Home</string>
     <string name="display_settings_title">Display</string>
     <!-- Sound settings screen heading -->
     <string name="sound_settings">Sound</string>
@@ -3230,6 +3239,15 @@
     <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
     <string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g>s</string>
 
+    <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_days_no_seconds"><xliff:g id="days">%1$d</xliff:g>d <xliff:g id="hours">%2$d</xliff:g>h <xliff:g id="minutes">%3$d</xliff:g>m</string>
+
+    <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_hours_no_seconds"><xliff:g id="hours">%1$d</xliff:g>h <xliff:g id="minutes">%2$d</xliff:g>m</string>
+
+    <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_minutes_no_seconds"><xliff:g id="minutes">%1$d</xliff:g>m</string>
+
     <!-- XXX remove? Strings used for displaying usage statistics -->
     <string name="usage_stats_label">Usage statistics</string>
 
@@ -3401,9 +3419,8 @@
          <xliff:g id="service" example="My Print Service">%1$s</xliff:g>?</string>
     <!-- Summary for a warning message about security implications of enabling a print service,
          displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
-    <string name="print_service_security_warning_summary">
-         <xliff:g id="print_service_name">%1$s</xliff:g> can receive documents you print.
-         Such documents may contain sensitive data.</string>
+    <string name="print_service_security_warning_summary">Your document may pass through
+        one or more servers on its way to the printer.</string>
 
     <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
     <string name="print_no_services_installed">No services installed</string>
@@ -3428,8 +3445,14 @@
     <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
     <string name="print_menu_item_search">Search</string>
 
-    <!-- Title for the printer categoty showing a list of available printers. [CHAR LIMIT=25] -->
-    <string name="category_printers">Printers</string>
+    <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+    <string name="print_searching_for_printers">Searching for printers</string>
+
+    <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+    <string name="print_print_jobs">Print jobs</string>
+
+    <!-- Title for the print jobs screen. [CHAR LIMIT=25] -->
+    <string name="print_active_print_jobs">Active print jobs</string>
 
     <!-- App Fuel Gauge strings -->
     <skip />
@@ -3610,16 +3633,38 @@
     <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
     <string name="app_memory_use">Memory use</string>
     <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
-    <string name="process_stats_total_duration">Stats over <xliff:g id="time">%1$s</xliff:g></string>
+    <string name="process_stats_total_duration"><xliff:g id="type">%1$s</xliff:g> apps over
+        <xliff:g id="time">%2$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_background">Background</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_foreground">Foreground</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_cached">Cached</string>
     <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
     <string name="process_stats_memory_status">Device memory is currently
         <xliff:g id="memstate">%1$s</xliff:g></string>
     <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
-    <string name="process_stats_ram_use">Average RAM use</string>
+    <string name="process_stats_avg_ram_use">Average RAM use</string>
+    <!-- [CHAR LIMIT=NONE] Label for item showing details of maximum RAM use -->
+    <string name="process_stats_max_ram_use">Maximum RAM use</string>
     <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
     <string name="process_stats_run_time">Run time</string>
     <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
     <string name="services_subtitle">Services</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether system processes are shown -->
+    <string name="menu_show_system">Show system</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+    <string name="menu_use_uss">Use Uss</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+    <string name="menu_proc_stats_type">Stats type</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+    <string name="menu_proc_stats_type_background">Background</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+    <string name="menu_proc_stats_type_foreground">Foreground</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+    <string name="menu_proc_stats_type_cached">Cached</string>
 
     <!-- Voice input/output settings --><skip />
     <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
@@ -4571,6 +4616,22 @@
     <string name="selinux_status_permissive">Permissive</string>
     <string name="selinux_status_enforcing">Enforcing</string>
 
+    <!-- Notification of installed CA Certs --> <skip/>
+
+    <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_warning">Network may be monitored</string>
+    <!-- Button to close the SSL CA cert warning dialog box.  [CHAR LIMIT=NONE] -->
+    <string name="done_button">Done</string>
+    <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_dialog_title">Network monitoring</string>
+    <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_info_message">This device is managed by: <xliff:g id="managing_domain">%s</xliff:g>.\n\nYour administrator is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nFor more information, contact your administrator.</string>
+    <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_warning_message">A third party is capable of monitoring your network\nactivity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible.</string>
+    <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+    <string name="ssl_ca_cert_settings_button">Check trusted credentials</string>
+
     <!-- User settings -->
     <skip/>
 
@@ -4667,6 +4728,9 @@
     <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
     <string name="apps_with_restrictions_settings_button">Expand settings for application</string>
 
+    <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+    <string name="home_app_uninstall_button">Uninstall this application</string>
+
     <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
     <string name="global_change_warning" product="tablet">This setting affects all users on this tablet.</string>
     <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index adf406b..4805cb6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -117,6 +117,14 @@
         <item name="android:scrollbarStyle">outsideOverlay</item>
     </style>
 
+    <style name="VertDivider">
+        <item name="android:layout_width">@dimen/vert_divider_width</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:background">@color/divider_color</item>
+        <item name="android:focusable">false</item>
+        <item name="android:clickable">false</item>
+    </style>
+
     <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
          be consistent with ProgressBar -->
     <style name="TopDivider">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b8b1ad2..19d1e91 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -67,5 +67,6 @@
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+        <item name="android:actionBarStyle">@android:style/Widget.Holo.ActionBar.Solid</item>
     </style>
 </resources>
diff --git a/res/xml/home_selection.xml b/res/xml/home_selection.xml
new file mode 100644
index 0000000..a348f9d
--- /dev/null
+++ b/res/xml/home_selection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/home_settings"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:key="home"
+        android:order="0">
+
+</PreferenceScreen>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 6aa6691..55b3bca 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -62,6 +62,13 @@
     <header android:id="@+id/device_section"
         android:title="@string/header_category_device" />
 
+    <!-- Home -->
+    <header
+        android:id="@+id/home_settings"
+        android:icon="@drawable/ic_settings_home"
+        android:fragment="com.android.settings.HomeSettings"
+        android:title="@string/home_settings" />
+
     <!-- Sound -->
     <header
         android:id="@+id/sound_settings"
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
new file mode 100644
index 0000000..6d937fd
--- /dev/null
+++ b/src/com/android/settings/HomeSettings.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import java.util.ArrayList;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+
+public class HomeSettings extends SettingsPreferenceFragment {
+    static final String TAG = "HomeSettings";
+
+    static final int REQUESTING_UNINSTALL = 10;
+
+    public static final String CURRENT_HOME = "current_home";
+
+    PreferenceGroup mPrefGroup;
+
+    PackageManager mPm;
+    ComponentName[] mHomeComponentSet;
+    ArrayList<HomeAppPreference> mPrefs;
+    HomeAppPreference mCurrentHome = null;
+    final IntentFilter mHomeFilter;
+
+    public HomeSettings() {
+        mHomeFilter = new IntentFilter(Intent.ACTION_MAIN);
+        mHomeFilter.addCategory(Intent.CATEGORY_HOME);
+        mHomeFilter.addCategory(Intent.CATEGORY_DEFAULT);
+    }
+
+    OnClickListener mHomeClickListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int index = (Integer)v.getTag();
+            HomeAppPreference pref = mPrefs.get(index);
+            if (!pref.isChecked) {
+                makeCurrentHome(pref);
+            }
+        }
+    };
+
+    OnClickListener mDeleteClickListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int index = (Integer)v.getTag();
+            uninstallApp(mPrefs.get(index));
+        }
+    };
+
+    void makeCurrentHome(HomeAppPreference newHome) {
+        if (mCurrentHome != null) {
+            mCurrentHome.setChecked(false);
+        }
+        newHome.setChecked(true);
+        mCurrentHome = newHome;
+
+        mPm.replacePreferredActivity(mHomeFilter, IntentFilter.MATCH_CATEGORY_EMPTY,
+                mHomeComponentSet, newHome.activityName);
+    }
+
+    void uninstallApp(HomeAppPreference pref) {
+        // Uninstallation is done by asking the OS to do it
+       Uri packageURI = Uri.parse("package:" + pref.activityName.getPackageName());
+       Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
+       uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, false);
+       int requestCode = REQUESTING_UNINSTALL + (pref.isChecked ? 1 : 0);
+       startActivityForResult(uninstallIntent, requestCode);
+   }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        // Rebuild the list now that we might have nuked something
+        buildHomeActivitiesList();
+
+        // if the previous home app is now gone, fall back to the system one
+        if (requestCode > REQUESTING_UNINSTALL) {
+            // if mCurrentHome has gone null, it means we didn't find the previously-
+            // default home app when rebuilding the list, i.e. it was the one we
+            // just uninstalled.  When that happens we make the system-bundled
+            // home app the active default.
+            if (mCurrentHome == null) {
+                for (int i = 0; i < mPrefs.size(); i++) {
+                    HomeAppPreference pref = mPrefs.get(i);
+                    if (pref.isSystem) {
+                        makeCurrentHome(pref);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    void buildHomeActivitiesList() {
+        ArrayList<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+        ComponentName currentDefaultHome  = mPm.getHomeActivities(homeActivities);
+
+        Context context = getActivity();
+        mCurrentHome = null;
+        mPrefGroup.removeAll();
+        mPrefs = new ArrayList<HomeAppPreference>();
+        mHomeComponentSet = new ComponentName[homeActivities.size()];
+        int prefIndex = 0;
+        for (int i = 0; i < homeActivities.size(); i++) {
+            final ResolveInfo candidate = homeActivities.get(i);
+            final ActivityInfo info = candidate.activityInfo;
+            ComponentName activityName = new ComponentName(info.packageName, info.name);
+            mHomeComponentSet[i] = activityName;
+            try {
+                Drawable icon = info.loadIcon(mPm);
+                CharSequence name = info.loadLabel(mPm);
+                boolean isSystem = (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+                HomeAppPreference pref = new HomeAppPreference(context, activityName, prefIndex,
+                        icon, name, this, isSystem);
+                mPrefs.add(pref);
+                mPrefGroup.addPreference(pref);
+                pref.setEnabled(true);
+                if (activityName.equals(currentDefaultHome)) {
+                    mCurrentHome = pref;
+                }
+                prefIndex++;
+            } catch (Exception e) {
+                Log.v(TAG, "Problem dealing with activity " + activityName, e);
+            }
+        }
+
+        if (mCurrentHome != null) {
+            new Handler().post(new Runnable() {
+               public void run() {
+                   mCurrentHome.setChecked(true);
+               }
+            });
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.home_selection);
+
+        mPm = getPackageManager();
+        mPrefGroup = (PreferenceGroup) findPreference("home");
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        buildHomeActivitiesList();
+    }
+
+    class HomeAppPreference extends Preference {
+        ComponentName activityName;
+        int index;
+        boolean isSystem;
+        HomeSettings fragment;
+        final ColorFilter grayscaleFilter;
+        boolean isChecked;
+
+        public HomeAppPreference(Context context, ComponentName activity,
+                int i, Drawable icon, CharSequence title,
+                HomeSettings parent, boolean sys) {
+            super(context);
+            setLayoutResource(R.layout.preference_home_app);
+            setIcon(icon);
+            setTitle(title);
+            activityName = activity;
+            fragment = parent;
+            index = i;
+            isSystem = sys;
+
+            ColorMatrix colorMatrix = new ColorMatrix();
+            colorMatrix.setSaturation(0f);
+            float[] matrix = colorMatrix.getArray();
+            matrix[18] = 0.5f;
+            grayscaleFilter = new ColorMatrixColorFilter(colorMatrix);
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+
+            RadioButton radio = (RadioButton) view.findViewById(R.id.home_radio);
+            radio.setChecked(isChecked);
+
+            Integer indexObj = new Integer(index);
+
+            ImageView icon = (ImageView) view.findViewById(R.id.home_app_uninstall);
+            if (isSystem) {
+                icon.setEnabled(false);
+                icon.setColorFilter(grayscaleFilter);
+            } else {
+                icon.setOnClickListener(mDeleteClickListener);
+                icon.setTag(indexObj);
+            }
+
+            View v = view.findViewById(R.id.home_app_pref);
+            v.setOnClickListener(mHomeClickListener);
+            v.setTag(indexObj);
+        }
+
+        void setChecked(boolean state) {
+            if (state != isChecked) {
+                isChecked = state;
+                notifyChanged();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
new file mode 100644
index 0000000..e2ac5d0
--- /dev/null
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.view.WindowManager;
+import android.view.WindowManagerGlobal;
+
+/**
+ * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network
+ * traffic.
+ */
+public class MonitoringCertInfoActivity extends Activity implements OnClickListener {
+
+    private boolean hasDeviceOwner = false;
+
+    @Override
+    protected void onCreate(Bundle savedStates) {
+        super.onCreate(savedStates);
+
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.ssl_ca_cert_dialog_title);
+        builder.setCancelable(true);
+        hasDeviceOwner = dpm.getDeviceOwner() != null;
+        int buttonLabel;
+        if (hasDeviceOwner) {
+            // Institutional case.  Show informational message.
+            String message = this.getResources().getString(R.string.ssl_ca_cert_info_message,
+                    dpm.getDeviceOwnerName());
+            builder.setMessage(message);
+            buttonLabel = R.string.done_button;
+        } else {
+            // Consumer case.  Show scary warning.
+            builder.setIcon(android.R.drawable.stat_notify_error);
+            builder.setMessage(R.string.ssl_ca_cert_warning_message);
+            buttonLabel = R.string.ssl_ca_cert_settings_button;
+        }
+
+        builder.setPositiveButton(buttonLabel, this);
+
+        final Dialog dialog = builder.create();
+        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        try {
+            WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
+        } catch (RemoteException e) {
+        }
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override public void onCancel(DialogInterface dialog) {
+                finish();
+            }
+        });
+
+        dialog.show();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (hasDeviceOwner) {
+            finish();
+        } else {
+            Intent intent =
+                    new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            finish();
+        }
+    }
+}
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e754f98..6b6e704 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -19,6 +19,7 @@
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
+import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -26,8 +27,10 @@
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.INetworkManagementService;
@@ -46,6 +49,7 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.Switch;
@@ -144,7 +148,8 @@
             R.id.about_settings,
             R.id.accessibility_settings,
             R.id.print_settings,
-            R.id.nfc_payment_settings
+            R.id.nfc_payment_settings,
+            R.id.home_settings
     };
 
     private SharedPreferences mDevelopmentPreferences;
@@ -558,6 +563,8 @@
             } else if (id == R.id.account_settings) {
                 int headerIndex = i + 1;
                 i = insertAccountsHeaders(target, headerIndex);
+            } else if (id == R.id.home_settings) {
+                updateHomeSettingHeaders(header);
             } else if (id == R.id.user_settings) {
                 if (!UserHandle.MU_ENABLED
                         || !UserManager.supportsMultipleUsers()
@@ -658,6 +665,51 @@
         return headerIndex;
     }
 
+    private boolean isSystemApp(ResolveInfo ri) {
+        return ((ri.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
+    }
+
+    private void updateHomeSettingHeaders(Header header) {
+        final PackageManager pm = getPackageManager();
+        final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>();
+        try {
+            ComponentName currentHome = pm.getHomeActivities(homeApps);
+            ResolveInfo iconSource = null;
+            if (currentHome == null) {
+                // no current default, so find the system home app and use that
+                for (int which = 0; which < homeApps.size(); which++) {
+                    ResolveInfo ri = homeApps.get(which);
+                    if (isSystemApp(ri)) {
+                        iconSource = ri;
+                        break;
+                    }
+                }
+            } else {
+                // find the current-home entry in the returned set
+                for (int which = 0; which < homeApps.size(); which++) {
+                    ResolveInfo ri = homeApps.get(which);
+                    ComponentName riName = new ComponentName(ri.activityInfo.packageName,
+                            ri.activityInfo.name);
+                    if (riName.equals(currentHome)) {
+                        iconSource = ri;
+                        break;
+                    }
+                }
+            }
+            if (iconSource != null) {
+                if (header.extras == null) {
+                    header.extras = new Bundle();
+                }
+                header.extras.putParcelable(HomeSettings.CURRENT_HOME, iconSource.activityInfo);
+            } else {
+                Log.v(LOG_TAG, "No home app icon found");
+            }
+        } catch (Exception e) {
+            // Can't look up the home activity; bail on configuring the icon
+            Log.w(LOG_TAG, "Problem looking up home activity!", e);
+        }
+    }
+
     private void getMetaData() {
         try {
             ActivityInfo ai = getPackageManager().getActivityInfo(getComponentName(),
@@ -695,17 +747,21 @@
         static final int HEADER_TYPE_CATEGORY = 0;
         static final int HEADER_TYPE_NORMAL = 1;
         static final int HEADER_TYPE_SWITCH = 2;
-        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_SWITCH + 1;
+        static final int HEADER_TYPE_BUTTON = 3;
+        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_BUTTON + 1;
 
         private final WifiEnabler mWifiEnabler;
         private final BluetoothEnabler mBluetoothEnabler;
         private AuthenticatorHelper mAuthHelper;
+        private DevicePolicyManager mDevicePolicyManager;
 
         private static class HeaderViewHolder {
             ImageView icon;
             TextView title;
             TextView summary;
             Switch switch_;
+            ImageButton button_;
+            View divider_;
         }
 
         private LayoutInflater mInflater;
@@ -715,6 +771,8 @@
                 return HEADER_TYPE_CATEGORY;
             } else if (header.id == R.id.wifi_settings || header.id == R.id.bluetooth_settings) {
                 return HEADER_TYPE_SWITCH;
+            } else if (header.id == R.id.security_settings) {
+                return HEADER_TYPE_BUTTON;
             } else {
                 return HEADER_TYPE_NORMAL;
             }
@@ -747,7 +805,7 @@
         }
 
         public HeaderAdapter(Context context, List<Header> objects,
-                AuthenticatorHelper authenticatorHelper) {
+                AuthenticatorHelper authenticatorHelper, DevicePolicyManager dpm) {
             super(context, 0, objects);
 
             mAuthHelper = authenticatorHelper;
@@ -757,6 +815,7 @@
             // Switches inflated from their layouts. Must be done before adapter is set in super
             mWifiEnabler = new WifiEnabler(context, new Switch(context));
             mBluetoothEnabler = new BluetoothEnabler(context, new Switch(context));
+            mDevicePolicyManager = dpm;
         }
 
         @Override
@@ -786,6 +845,18 @@
                         holder.switch_ = (Switch) view.findViewById(R.id.switchWidget);
                         break;
 
+                    case HEADER_TYPE_BUTTON:
+                        view = mInflater.inflate(R.layout.preference_header_button_item, parent,
+                                false);
+                        holder.icon = (ImageView) view.findViewById(R.id.icon);
+                        holder.title = (TextView)
+                                view.findViewById(com.android.internal.R.id.title);
+                        holder.summary = (TextView)
+                                view.findViewById(com.android.internal.R.id.summary);
+                        holder.button_ = (ImageButton) view.findViewById(R.id.buttonWidget);
+                        holder.divider_ = view.findViewById(R.id.divider);
+                        break;
+
                     case HEADER_TYPE_NORMAL:
                         view = mInflater.inflate(
                                 R.layout.preference_header_item, parent,
@@ -816,38 +887,80 @@
                     } else {
                         mBluetoothEnabler.setSwitch(holder.switch_);
                     }
-                    // No break, fall through on purpose to update common fields
+                    updateCommonHeaderView(header, holder);
+                    break;
 
-                    //$FALL-THROUGH$
+                case HEADER_TYPE_BUTTON:
+                    if (header.id == R.id.security_settings) {
+                        boolean hasCert = DevicePolicyManager.hasAnyCaCertsInstalled();
+                        if (hasCert) {
+                            holder.button_.setVisibility(View.VISIBLE);
+                            holder.divider_.setVisibility(View.VISIBLE);
+                            boolean isManaged = mDevicePolicyManager.getDeviceOwner() != null;
+                            if (isManaged) {
+                                holder.button_.setImageResource(R.drawable.ic_qs_certificate_info);
+                            } else {
+                                holder.button_.setImageResource(
+                                        android.R.drawable.stat_notify_error);
+                            }
+                            holder.button_.setOnClickListener(new OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    Intent intent = new Intent(
+                                            android.provider.Settings.ACTION_MONITORING_CERT_INFO);
+                                    getContext().startActivity(intent);
+                                }
+                            });
+                        } else {
+                            holder.button_.setVisibility(View.GONE);
+                            holder.divider_.setVisibility(View.GONE);
+                        }
+                    }
+                    updateCommonHeaderView(header, holder);
+                    break;
+
                 case HEADER_TYPE_NORMAL:
-                    if (header.extras != null
-                            && header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
-                        String accType = header.extras.getString(
-                                ManageAccountsSettings.KEY_ACCOUNT_TYPE);
-                        ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
-                        lp.width = getContext().getResources().getDimensionPixelSize(
-                                R.dimen.header_icon_width);
-                        lp.height = lp.width;
-                        holder.icon.setLayoutParams(lp);
-                        Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
-                        holder.icon.setImageDrawable(icon);
-                    } else {
-                        holder.icon.setImageResource(header.iconRes);
-                    }
-                    holder.title.setText(header.getTitle(getContext().getResources()));
-                    CharSequence summary = header.getSummary(getContext().getResources());
-                    if (!TextUtils.isEmpty(summary)) {
-                        holder.summary.setVisibility(View.VISIBLE);
-                        holder.summary.setText(summary);
-                    } else {
-                        holder.summary.setVisibility(View.GONE);
-                    }
+                    updateCommonHeaderView(header, holder);
                     break;
             }
 
             return view;
         }
 
+        private void updateCommonHeaderView(Header header, HeaderViewHolder holder) {
+                if (header.extras != null
+                        && header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
+                    String accType = header.extras.getString(
+                            ManageAccountsSettings.KEY_ACCOUNT_TYPE);
+                    Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
+                    setHeaderIcon(holder, icon);
+                } else if (header.extras != null &&
+                        header.extras.containsKey(HomeSettings.CURRENT_HOME)) {
+                    ActivityInfo ai = header.extras.getParcelable(HomeSettings.CURRENT_HOME);
+                    Drawable icon = ai.loadIcon(getContext().getPackageManager());
+                    setHeaderIcon(holder, icon);
+                } else {
+                    holder.icon.setImageResource(header.iconRes);
+                }
+                holder.title.setText(header.getTitle(getContext().getResources()));
+                CharSequence summary = header.getSummary(getContext().getResources());
+                if (!TextUtils.isEmpty(summary)) {
+                    holder.summary.setVisibility(View.VISIBLE);
+                    holder.summary.setText(summary);
+                } else {
+                    holder.summary.setVisibility(View.GONE);
+                }
+            }
+
+        private void setHeaderIcon(HeaderViewHolder holder, Drawable icon) {
+            ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
+            lp.width = getContext().getResources().getDimensionPixelSize(
+                    R.dimen.header_icon_width);
+            lp.height = lp.width;
+            holder.icon.setLayoutParams(lp);
+            holder.icon.setImageDrawable(icon);
+        }
+
         public void resume() {
             mWifiEnabler.resume();
             mBluetoothEnabler.resume();
@@ -904,7 +1017,9 @@
         if (adapter == null) {
             super.setListAdapter(null);
         } else {
-            super.setListAdapter(new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper));
+            DevicePolicyManager dpm =
+                    (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+            super.setListAdapter(new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper, dpm));
         }
     }
 
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 5834f99..4d24d09 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -20,6 +20,7 @@
 import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -41,6 +42,7 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.text.TextUtils.SimpleStringSplitter;
+import android.util.Log;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.View;
@@ -66,6 +68,8 @@
  */
 public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
         Preference.OnPreferenceChangeListener {
+    private static final String LOG_TAG = "AccessibilitySettings";
+
     private static final String DEFAULT_SCREENREADER_MARKET_LINK =
             "market://search?q=pname:com.google.android.marvin.talkback";
 
@@ -605,7 +609,12 @@
                                         Uri marketUri = Uri.parse(screenreaderMarketLink);
                                         Intent marketIntent = new Intent(Intent.ACTION_VIEW,
                                                 marketUri);
-                                        startActivity(marketIntent);
+                                        try {
+                                            startActivity(marketIntent);
+                                        } catch (ActivityNotFoundException anfe) {
+                                            Log.w(LOG_TAG, "Couldn't start play store activity",
+                                                    anfe);
+                                        }
                                     }
                                 })
                         .setNegativeButton(android.R.string.cancel, null)
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3e9ba54..37c33db 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -242,10 +242,14 @@
     }
     
     private void initDataButtons() {
-        if ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
-                | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
-                == ApplicationInfo.FLAG_SYSTEM
-                || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+        // If the app doesn't have its own space management UI
+        // And it's a system app that doesn't allow clearing user data or is an active admin
+        // Then disable the Clear Data button.
+        if (mAppEntry.info.manageSpaceActivityName == null
+                && ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
+                        | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
+                        == ApplicationInfo.FLAG_SYSTEM
+                        || mDpm.packageHasActiveAdmins(mPackageInfo.packageName))) {
             mClearDataButton.setText(R.string.clear_user_data_text);
             mClearDataButton.setEnabled(false);
             mCanClearData = false;
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
index d6311dc..8308784 100644
--- a/src/com/android/settings/applications/ProcStatsEntry.java
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -38,6 +38,9 @@
     final boolean mUnique;
     final long mDuration;
     final long mAvgPss;
+    final long mMaxPss;
+    final long mAvgUss;
+    final long mMaxUss;
     final long mWeight;
 
     String mBestTargetPackage;
@@ -50,7 +53,7 @@
     public String mUiPackage;
 
     public ProcStatsEntry(ProcessStats.ProcessState proc,
-            ProcessStats.ProcessDataCollection tmpTotals) {
+            ProcessStats.ProcessDataCollection tmpTotals, boolean useUss, boolean weightWithTime) {
         ProcessStats.computeProcessData(proc, tmpTotals, 0);
         mPackage = proc.mPackage;
         mUid = proc.mUid;
@@ -58,7 +61,10 @@
         mUnique = proc.mCommonProcess == proc;
         mDuration = tmpTotals.totalTime;
         mAvgPss = tmpTotals.avgPss;
-        mWeight = mDuration * mAvgPss;
+        mMaxPss = tmpTotals.maxPss;
+        mAvgUss = tmpTotals.avgUss;
+        mMaxUss = tmpTotals.maxUss;
+        mWeight = (weightWithTime ? mDuration : 1) * (useUss ? mAvgUss : mAvgPss);
     }
 
     public ProcStatsEntry(Parcel in) {
@@ -68,13 +74,16 @@
         mUnique = in.readInt() != 0;
         mDuration = in.readLong();
         mAvgPss = in.readLong();
+        mMaxPss = in.readLong();
+        mAvgUss = in.readLong();
+        mMaxUss = in.readLong();
         mWeight = in.readLong();
         mBestTargetPackage = in.readString();
         in.readTypedList(mServices, Service.CREATOR);
     }
 
-    public void evaluateTargetPackage(ProcessStats stats,
-            ProcessStats.ProcessDataCollection totals, Comparator<ProcStatsEntry> compare) {
+    public void evaluateTargetPackage(ProcessStats stats, ProcessStats.ProcessDataCollection totals,
+            Comparator<ProcStatsEntry> compare, boolean useUss, boolean weightWithTime) {
         mBestTargetPackage = null;
         if (mUnique) {
             mBestTargetPackage = mPackage;
@@ -93,7 +102,8 @@
                         ProcessStats.ProcessState subProc =
                                 pkgState.mProcesses.valueAt(iproc);
                         if (subProc.mName.equals(mName)) {
-                            subProcs.add(new ProcStatsEntry(subProc, totals));
+                            subProcs.add(new ProcStatsEntry(subProc, totals, useUss,
+                                    weightWithTime));
                         }
                     }
                 }
@@ -184,6 +194,9 @@
         dest.writeInt(mUnique ? 1 : 0);
         dest.writeLong(mDuration);
         dest.writeLong(mAvgPss);
+        dest.writeLong(mMaxPss);
+        dest.writeLong(mAvgUss);
+        dest.writeLong(mMaxUss);
         dest.writeLong(mWeight);
         dest.writeString(mBestTargetPackage);
         dest.writeTypedList(mServices);
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index 5ec3b07..fad3745 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -52,6 +52,7 @@
     public static final int ACTION_FORCE_STOP = 1;
 
     public static final String EXTRA_ENTRY = "entry";
+    public static final String EXTRA_USE_USS = "use_uss";
     public static final String EXTRA_MAX_WEIGHT = "max_weight";
     public static final String EXTRA_TOTAL_TIME = "total_time";
 
@@ -59,6 +60,7 @@
     private DevicePolicyManager mDpm;
 
     private ProcStatsEntry mEntry;
+    private boolean mUseUss;
     private long mMaxWeight;
     private long mTotalTime;
 
@@ -83,6 +85,7 @@
         final Bundle args = getArguments();
         mEntry = (ProcStatsEntry)args.getParcelable(EXTRA_ENTRY);
         mEntry.retrieveUiData(mPm);
+        mUseUss = args.getBoolean(EXTRA_USE_USS);
         mMaxWeight = args.getLong(EXTRA_MAX_WEIGHT);
         mTotalTime = args.getLong(EXTRA_TOTAL_TIME);
     }
@@ -177,8 +180,12 @@
     }
 
     private void fillDetailsSection() {
-        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_ram_use),
-                Formatter.formatShortFileSize(getActivity(), mEntry.mAvgPss * 1024));
+        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_avg_ram_use),
+                Formatter.formatShortFileSize(getActivity(),
+                        (mUseUss ? mEntry.mAvgUss : mEntry.mAvgPss) * 1024));
+        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_max_ram_use),
+                Formatter.formatShortFileSize(getActivity(),
+                        (mUseUss ? mEntry.mMaxUss : mEntry.mMaxPss) * 1024));
         addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_run_time),
                 makePercentString(getResources(), mEntry.mDuration, mTotalTime));
     }
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 5c5355d..7601309 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -37,6 +37,7 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.SubMenu;
 import com.android.internal.app.IProcessStats;
 import com.android.internal.app.ProcessStats;
 import com.android.settings.R;
@@ -56,9 +57,14 @@
     private static final String KEY_MEM_STATUS = "mem_status";
 
     private static final int MENU_STATS_REFRESH = Menu.FIRST;
-    private static final int MENU_HELP = Menu.FIRST + 2;
+    private static final int MENU_SHOW_SYSTEM = Menu.FIRST + 1;
+    private static final int MENU_USE_USS = Menu.FIRST + 2;
+    private static final int MENU_TYPE_BACKGROUND = Menu.FIRST + 3;
+    private static final int MENU_TYPE_FOREGROUND = Menu.FIRST + 4;
+    private static final int MENU_TYPE_CACHED = Menu.FIRST + 5;
+    private static final int MENU_HELP = Menu.FIRST + 6;
 
-    static final int MAX_ITEMS_TO_LIST = 20;
+    static final int MAX_ITEMS_TO_LIST = 40;
 
     final static Comparator<ProcStatsEntry> sEntryCompare = new Comparator<ProcStatsEntry>() {
         @Override
@@ -79,6 +85,16 @@
     ProcessStats mStats;
     int mMemState;
 
+    private boolean mShowSystem;
+    private boolean mUseUss;
+    private int mStatsType;
+
+    private MenuItem mShowSystemMenu;
+    private MenuItem mUseUssMenu;
+    private MenuItem mTypeBackgroundMenu;
+    private MenuItem mTypeForegroundMenu;
+    private MenuItem mTypeCachedMenu;
+
     private PreferenceGroup mAppListGroup;
     private Preference mMemStatusPref;
 
@@ -99,6 +115,10 @@
         mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
         mMemStatusPref = mAppListGroup.findPreference(KEY_MEM_STATUS);
+        mShowSystem = icicle != null ? icicle.getBoolean("show_system") : false;
+        mUseUss = icicle != null ? icicle.getBoolean("use_uss") : false;
+        mStatsType = icicle != null ? icicle.getInt("stats_type", MENU_TYPE_BACKGROUND)
+                : MENU_TYPE_BACKGROUND;
         setHasOptionsMenu(true);
     }
 
@@ -114,6 +134,14 @@
     }
 
     @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean("show_system", mShowSystem);
+        outState.putBoolean("use_uss", mUseUss);
+        outState.putInt("stats_type", mStatsType);
+    }
+
+    @Override
     public void onDestroy() {
         super.onDestroy();
         if (getActivity().isChangingConfigurations()) {
@@ -130,6 +158,7 @@
         ProcessStatsPreference pgp = (ProcessStatsPreference) preference;
         Bundle args = new Bundle();
         args.putParcelable(ProcessStatsDetail.EXTRA_ENTRY, pgp.getEntry());
+        args.putBoolean(ProcessStatsDetail.EXTRA_USE_USS, mUseUss);
         args.putLong(ProcessStatsDetail.EXTRA_MAX_WEIGHT, mMaxWeight);
         args.putLong(ProcessStatsDetail.EXTRA_TOTAL_TIME, mTotalTime);
         ((PreferenceActivity) getActivity()).startPreferencePanel(
@@ -145,6 +174,31 @@
                 .setAlphabeticShortcut('r');
         refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        mShowSystemMenu = menu.add(0, MENU_SHOW_SYSTEM, 0, R.string.menu_show_system)
+                .setAlphabeticShortcut('s')
+                .setCheckable(true)
+                .setChecked(mShowSystem)
+                .setEnabled(mStatsType == MENU_TYPE_BACKGROUND);
+        mUseUssMenu = menu.add(0, MENU_USE_USS, 0, R.string.menu_use_uss)
+                .setAlphabeticShortcut('s')
+                .setCheckable(true)
+                .setChecked(mUseUss);
+        SubMenu subMenu = menu.addSubMenu(R.string.menu_proc_stats_type);
+        mTypeBackgroundMenu = subMenu.add(0, MENU_TYPE_BACKGROUND, 0,
+                R.string.menu_proc_stats_type_background)
+                .setAlphabeticShortcut('b')
+                .setCheckable(true)
+                .setChecked(mStatsType == MENU_TYPE_BACKGROUND);
+        mTypeForegroundMenu = subMenu.add(0, MENU_TYPE_FOREGROUND, 0,
+                R.string.menu_proc_stats_type_foreground)
+                .setAlphabeticShortcut('f')
+                .setCheckable(true)
+                .setChecked(mStatsType == MENU_TYPE_FOREGROUND);
+        mTypeCachedMenu = subMenu.add(0, MENU_TYPE_CACHED, 0,
+                R.string.menu_proc_stats_type_cached)
+                .setAlphabeticShortcut('c')
+                .setCheckable(true)
+                .setChecked(mStatsType == MENU_TYPE_CACHED);
 
         /*
         String helpUrl;
@@ -162,6 +216,20 @@
                 mStats = null;
                 refreshStats();
                 return true;
+            case MENU_SHOW_SYSTEM:
+                mShowSystem = !mShowSystem;
+                refreshStats();
+                return true;
+            case MENU_USE_USS:
+                mUseUss = !mUseUss;
+                refreshStats();
+                return true;
+            case MENU_TYPE_BACKGROUND:
+            case MENU_TYPE_FOREGROUND:
+            case MENU_TYPE_CACHED:
+                mStatsType = item.getItemId();
+                refreshStats();
+                return true;
             default:
                 return false;
         }
@@ -173,18 +241,65 @@
         mAppListGroup.addPreference(notAvailable);
     }
 
+    public static final int[] BACKGROUND_AND_SYSTEM_PROC_STATES = new int[] {
+            ProcessStats.STATE_PERSISTENT, ProcessStats.STATE_IMPORTANT_FOREGROUND,
+            ProcessStats.STATE_IMPORTANT_BACKGROUND, ProcessStats.STATE_BACKUP,
+            ProcessStats.STATE_HEAVY_WEIGHT, ProcessStats.STATE_SERVICE,
+            ProcessStats.STATE_SERVICE_RESTARTING, ProcessStats.STATE_RECEIVER
+    };
+
+    public static final int[] FOREGROUND_PROC_STATES = new int[] {
+            ProcessStats.STATE_TOP
+    };
+
+    public static final int[] CACHED_PROC_STATES = new int[] {
+            ProcessStats.STATE_CACHED_ACTIVITY, ProcessStats.STATE_CACHED_ACTIVITY_CLIENT,
+            ProcessStats.STATE_CACHED_EMPTY
+    };
+
     private void refreshStats() {
         if (mStats == null) {
             load();
         }
 
+        if (mShowSystemMenu != null) {
+            mShowSystemMenu.setChecked(mShowSystem);
+            mShowSystemMenu.setEnabled(mStatsType == MENU_TYPE_BACKGROUND);
+        }
+        if (mUseUssMenu != null) {
+            mUseUssMenu.setChecked(mUseUss);
+        }
+        if (mTypeBackgroundMenu != null) {
+            mTypeBackgroundMenu.setChecked(mStatsType == MENU_TYPE_BACKGROUND);
+        }
+        if (mTypeForegroundMenu != null) {
+            mTypeForegroundMenu.setChecked(mStatsType == MENU_TYPE_FOREGROUND);
+        }
+        if (mTypeCachedMenu != null) {
+            mTypeCachedMenu.setChecked(mStatsType == MENU_TYPE_CACHED);
+        }
+
+        int[] stats;
+        int statsLabel;
+        if (mStatsType == MENU_TYPE_FOREGROUND) {
+            stats = FOREGROUND_PROC_STATES;
+            statsLabel = R.string.process_stats_type_foreground;
+        } else if (mStatsType == MENU_TYPE_CACHED) {
+            stats = CACHED_PROC_STATES;
+            statsLabel = R.string.process_stats_type_cached;
+        } else {
+            stats = mShowSystem ? BACKGROUND_AND_SYSTEM_PROC_STATES
+                    : ProcessStats.BACKGROUND_PROC_STATES;
+            statsLabel = R.string.process_stats_type_background;
+        }
+
         mAppListGroup.removeAll();
         mAppListGroup.setOrderingAsAdded(false);
 
         mMemStatusPref.setOrder(-2);
         mAppListGroup.addPreference(mMemStatusPref);
         String durationString = Utils.formatElapsedTime(getActivity(),
-                mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime);
+                mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime, false);
         CharSequence memString;
         CharSequence[] memStates = getResources().getTextArray(R.array.ram_states);
         if (mMemState >= 0 && mMemState < memStates.length) {
@@ -193,7 +308,7 @@
             memString = "?";
         }
         mMemStatusPref.setTitle(getActivity().getString(R.string.process_stats_total_duration,
-                durationString));
+                getActivity().getString(statsLabel), durationString));
         mMemStatusPref.setSummary(getActivity().getString(R.string.process_stats_memory_status,
                         memString));
         /*
@@ -208,8 +323,7 @@
         */
 
         ProcessStats.ProcessDataCollection totals = new ProcessStats.ProcessDataCollection(
-                ProcessStats.ALL_SCREEN_ADJ, ProcessStats.ALL_MEM_ADJ,
-                ProcessStats.BACKGROUND_PROC_STATES);
+                ProcessStats.ALL_SCREEN_ADJ, ProcessStats.ALL_MEM_ADJ, stats);
 
         long now = SystemClock.uptimeMillis();
 
@@ -251,7 +365,8 @@
         for (int ip=0, N=mStats.mProcesses.getMap().size(); ip<N; ip++) {
             SparseArray<ProcessStats.ProcessState> uids = mStats.mProcesses.getMap().valueAt(ip);
             for (int iu=0; iu<uids.size(); iu++) {
-                ProcStatsEntry ent = new ProcStatsEntry(uids.valueAt(iu), totals);
+                ProcStatsEntry ent = new ProcStatsEntry(uids.valueAt(iu), totals, mUseUss,
+                        mStatsType == MENU_TYPE_BACKGROUND);
                 procs.add(ent);
                 processes.put(ent.mName, ent);
             }
@@ -275,9 +390,10 @@
             ProcStatsEntry proc = procs.get(i);
             final double percentOfWeight = (((double)proc.mWeight) / maxWeight) * 100;
             final double percentOfTime = (((double)proc.mDuration) / mTotalTime) * 100;
-            if (percentOfWeight < 1) continue;
+            if (percentOfWeight < 2) break;
             ProcessStatsPreference pref = new ProcessStatsPreference(getActivity(), null, proc);
-            proc.evaluateTargetPackage(mStats, totals, sEntryCompare);
+            proc.evaluateTargetPackage(mStats, totals, sEntryCompare, mUseUss,
+                    mStatsType == MENU_TYPE_BACKGROUND);
             proc.retrieveUiData(pm);
             pref.setTitle(proc.mUiLabel);
             if (proc.mUiTargetApp != null) {
@@ -290,15 +406,17 @@
         }
 
         // Add in service info.
-        for (int ip=0, N=mStats.mPackages.getMap().size(); ip<N; ip++) {
-            SparseArray<ProcessStats.PackageState> uids = mStats.mPackages.getMap().valueAt(ip);
-            for (int iu=0; iu<uids.size(); iu++) {
-                ProcessStats.PackageState ps = uids.valueAt(iu);
-                for (int is=0, NS=ps.mServices.size(); is<NS; is++) {
-                    ProcessStats.ServiceState ss = ps.mServices.valueAt(is);
-                    if (ss.mProcessName != null) {
-                        ProcStatsEntry ent = processes.get(ss.mProcessName);
-                        ent.addService(ss);
+        if (mStatsType == MENU_TYPE_BACKGROUND) {
+            for (int ip=0, N=mStats.mPackages.getMap().size(); ip<N; ip++) {
+                SparseArray<ProcessStats.PackageState> uids = mStats.mPackages.getMap().valueAt(ip);
+                for (int iu=0; iu<uids.size(); iu++) {
+                    ProcessStats.PackageState ps = uids.valueAt(iu);
+                    for (int is=0, NS=ps.mServices.size(); is<NS; is++) {
+                        ProcessStats.ServiceState ss = ps.mServices.valueAt(is);
+                        if (ss.mProcessName != null) {
+                            ProcStatsEntry ent = processes.get(ss.mProcessName);
+                            ent.addService(ss);
+                        }
                     }
                 }
             }
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index aac1d4e..012aff0 100755
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -28,7 +28,6 @@
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Button;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -64,6 +63,9 @@
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
+                int requestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                               BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
+                if (requestType != mRequestType) return;
                 BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
                 if (mDevice.equals(device)) dismissDialog();
             }
@@ -94,6 +96,8 @@
         mRequestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
                                      BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
 
+        if(DEBUG) Log.i(TAG, "onCreate() Request type: " + mRequestType);
+
         if (mRequestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
             showDialog(getString(R.string.bluetooth_connection_permission_request), mRequestType);
         } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
@@ -117,6 +121,7 @@
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = title;
+        if(DEBUG) Log.i(TAG, "showDialog() Request type: " + mRequestType + " this: " + this);
         switch(requestType)
         {
         case BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION:
@@ -137,15 +142,16 @@
         setupAlert();
 
     }
-
-    private String createDisplayText(String message) {
-        String mMessage1 = message;
-        return mMessage1;
+    @Override
+    public void onBackPressed() {
+        /*we need an answer so ignore back button presses during auth */
+        if(DEBUG) Log.i(TAG, "Back button pressed! ignoring");
+        return;
     }
-
     private String createRemoteName()
     {
         String mRemoteName = mDevice != null ? mDevice.getAliasName() : null;
+
         if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
         return mRemoteName;
     }
@@ -154,8 +160,8 @@
         String mRemoteName = createRemoteName();
         mView = getLayoutInflater().inflate(R.layout.bluetooth_connection_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createDisplayText(getString(R.string.bluetooth_connection_dialog_text,
-                mRemoteName)));
+        messageView.setText(getString(R.string.bluetooth_connection_dialog_text,
+                mRemoteName));
         return mView;
     }
 
@@ -177,8 +183,8 @@
         String mRemoteName = createRemoteName();
         mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createDisplayText(getString(R.string.bluetooth_pb_acceptance_dialog_text,
-                mRemoteName, mRemoteName)));
+        messageView.setText(getString(R.string.bluetooth_pb_acceptance_dialog_text,
+                mRemoteName, mRemoteName));
         createCheckbox(R.id.bluetooth_remember_choice);
         return mView;
     }
@@ -186,8 +192,8 @@
         String mRemoteName = createRemoteName();
         mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createDisplayText(getString(R.string.bluetooth_map_acceptance_dialog_text,
-                mRemoteName, mRemoteName)));
+        messageView.setText(getString(R.string.bluetooth_map_acceptance_dialog_text,
+                mRemoteName, mRemoteName));
         createCheckbox(R.id.bluetooth_remember_choice);
         return mView;
     }
@@ -221,6 +227,8 @@
         if (mReturnPackage != null && mReturnClass != null) {
             intent.setClassName(mReturnPackage, mReturnClass);
         }
+        if(DEBUG) Log.i(TAG, "sendIntentToReceiver() Request type: " + mRequestType +
+                " mReturnPackage" + mReturnPackage + " mReturnClass" + mReturnClass);
 
         intent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
                         allowed ? BluetoothDevice.CONNECTION_ACCESS_YES :
@@ -230,6 +238,7 @@
             intent.putExtra(extraName, extraValue);
         }
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
         sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
     }
 
@@ -271,12 +280,11 @@
                                                          bluetoothManager.getProfileManager(),
                                                          mDevice);
         }
-        if (permissionType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS){
+        if(permissionType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS){
             cachedDevice.setPhonebookPermissionChoice(permissionChoice);
         }else if (permissionType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS){
             cachedDevice.setMessagePermissionChoice(permissionChoice);
         }
-
     }
 
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index 343018e..c3b93be 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -36,7 +36,11 @@
 
     private static final String TAG = "BluetoothPermissionRequest";
     private static final boolean DEBUG = Utils.V;
-    public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+    private static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+
+    private static final String NOTIFICATION_TAG_PBAP = "Phonebook Access" ;
+    private static final String NOTIFICATION_TAG_MAP = "Message Access";
+
 
     Context mContext;
     int mRequestType;
@@ -49,7 +53,7 @@
         mContext = context;
         String action = intent.getAction();
 
-        if (DEBUG) Log.d(TAG, "onReceive");
+        if (DEBUG) Log.d(TAG, "onReceive" + action);
 
         if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
             // convert broadcast intent into activity intent (same action string)
@@ -59,14 +63,8 @@
             mReturnPackage = intent.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
             mReturnClass = intent.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
 
-            Intent connectionAccessIntent = new Intent(action);
-            connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
-            connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
-                                            mRequestType);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_PACKAGE_NAME, mReturnPackage);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass);
+            if (DEBUG) Log.d(TAG, "onReceive request type: " + mRequestType + " return "
+                    + mReturnPackage + "," + mReturnClass);
 
             // Check if user had made decisions on accepting or rejecting the phonebook access
             // request. If there is, reply the request and return, no need to start permission
@@ -75,8 +73,22 @@
                 return;
             }
 
-            String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
+            Intent connectionAccessIntent = new Intent(action);
+            connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
+            // We use the FLAG_ACTIVITY_MULTIPLE_TASK since we can have multiple concurrent access requests
+            connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            connectionAccessIntent.setType(Integer.toString(mRequestType)); /* This is needed to create two pending
+                                                                               intents to the same activity.
+                                                                               The value is not used in the activity. */
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                            mRequestType);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_PACKAGE_NAME, mReturnPackage);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass);
 
+            String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
+            String title = null;
+            String message = null;
             PowerManager powerManager =
                 (PowerManager) context.getSystemService(Context.POWER_SERVICE);
 
@@ -93,33 +105,61 @@
                 deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
                 deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
                         BluetoothDevice.CONNECTION_ACCESS_NO);
-
-                Notification notification = new Notification(
-                    android.R.drawable.stat_sys_data_bluetooth,
-                    context.getString(R.string.bluetooth_connection_permission_request),
-                    System.currentTimeMillis());
+                deleteIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
                 String deviceName = mDevice != null ? mDevice.getAliasName() : null;
-                notification.setLatestEventInfo(context,
-                    context.getString(R.string.bluetooth_connection_permission_request),
-                    context.getString(R.string.bluetooth_connection_notif_message, deviceName),
-                    PendingIntent.getActivity(context, 0, connectionAccessIntent, 0));
-                notification.flags = Notification.FLAG_AUTO_CANCEL |
-                                     Notification.FLAG_ONLY_ALERT_ONCE;
-                notification.defaults = Notification.DEFAULT_SOUND;
-                notification.deleteIntent = PendingIntent.getBroadcast(context, 0, deleteIntent, 0);
+                switch (mRequestType) {
+                    case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS:
+                        title = context.getString(R.string.bluetooth_phonebook_request);
+                        message = context.getString(R.string.bluetooth_pb_acceptance_dialog_text, deviceName, deviceName);
+                        break;
+                    case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
+                        title = context.getString(R.string.bluetooth_map_request);
+                        message = context.getString(R.string.bluetooth_map_acceptance_dialog_text, deviceName, deviceName);
+                        break;
+                    default:
+                        title = context.getString(R.string.bluetooth_connection_permission_request);
+                        message = context.getString(R.string.bluetooth_connection_dialog_text, deviceName, deviceName);
+                        break;
+                }
+                Notification notification = new Notification.Builder(context)
+                                        .setContentTitle(title)
+                                        .setTicker(message)
+                                        .setContentText(message)
+                                        .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
+                                        .setAutoCancel(true)
+                                        .setPriority(Notification.PRIORITY_MAX)
+                                        .setOnlyAlertOnce(false)
+                                        .setDefaults(Notification.DEFAULT_ALL)
+                                        .setContentIntent(PendingIntent.getActivity(context, 0, connectionAccessIntent, 0))
+                                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))
+                                        .build();
+
+                notification.flags |= Notification.FLAG_NO_CLEAR; /* cannot be set with the builder */
 
                 NotificationManager notificationManager =
                     (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+
+                notificationManager.notify(getNotificationTag(mRequestType),NOTIFICATION_ID, notification);
             }
         } else if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
             // Remove the notification
             NotificationManager manager = (NotificationManager) context
                 .getSystemService(Context.NOTIFICATION_SERVICE);
-            manager.cancel(NOTIFICATION_ID);
+            mRequestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                        BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
+            manager.cancel(getNotificationTag(mRequestType), NOTIFICATION_ID);
         }
     }
 
+    private String getNotificationTag(int requestType) {
+        if(requestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            return NOTIFICATION_TAG_PBAP;
+        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            return NOTIFICATION_TAG_MAP;
+        }
+        return null;
+    }
+
     /**
      * @return true user had made a choice, this method replies to the request according
      *              to user's previous decision
@@ -185,6 +225,7 @@
                 Log.e(TAG, "Bad messagePermission: " + messagePermission);
             }
         }
+        if(DEBUG) Log.d(TAG,"checkUserChoice(): returning " + processed);
         return processed;
     }
 
@@ -204,6 +245,7 @@
             intent.putExtra(extraName, extraValue);
         }
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
         mContext.sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
     }
 }
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index 9742027..a9fd5ed 100755
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -140,6 +140,18 @@
                     mLocalNapRoleConnected = true;
                 }
             }
+            if (profile instanceof MapProfile) {
+                profile.setPreferred(mDevice, true);
+                refresh();
+            }
+        } else if (profile instanceof MapProfile &&
+                newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
+            if (mProfiles.contains(profile)) {
+                mRemovedProfiles.add(profile);
+                mProfiles.remove(profile);
+            }
+            profile.setPreferred(mDevice, false);
+            refresh();
         } else if (mLocalNapRoleConnected && profile instanceof PanProfile &&
                 ((PanProfile) profile).isLocalRoleNap(mDevice) &&
                 newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 6f4a765..f00b801 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -20,14 +20,15 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.util.Log;
 
 /**
  * LocalBluetoothPreferences provides an interface to the preferences
  * related to Bluetooth.
  */
 final class LocalBluetoothPreferences {
-//    private static final String TAG = "LocalBluetoothPreferences";
-
+    private static final String TAG = "LocalBluetoothPreferences";
+    private static final boolean DEBUG = Utils.D;
     private static final String SHARED_PREFERENCES_NAME = "bluetooth_settings";
 
     // If a device was picked from the device picker or was in discoverable mode
@@ -61,6 +62,7 @@
             String deviceAddress) {
         LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
         if (manager == null) {
+            if(DEBUG) Log.v(TAG, "manager == null - do not show dialog.");
             return false;
         }
 
@@ -72,6 +74,7 @@
         // 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) {
+            if (DEBUG) Log.v(TAG, "in appliance mode - do not show dialog.");
             return false;
         }
 
@@ -109,6 +112,7 @@
                 }
             }
         }
+        if (DEBUG) Log.v(TAG, "Found no reason to show the dialog - do not show dialog.");
         return false;
     }
 
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index 59a6944..78d6441 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -19,6 +19,7 @@
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothMap;
 import android.bluetooth.BluetoothInputDevice;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothPbap;
@@ -44,7 +45,7 @@
  */
 final class LocalBluetoothProfileManager {
     private static final String TAG = "LocalBluetoothProfileManager";
-
+    private static final boolean DEBUG = Utils.D;
     /** Singleton instance. */
     private static LocalBluetoothProfileManager sInstance;
 
@@ -79,6 +80,7 @@
 
     private A2dpProfile mA2dpProfile;
     private HeadsetProfile mHeadsetProfile;
+    private MapProfile mMapProfile;
     private final HidProfile mHidProfile;
     private OppProfile mOppProfile;
     private final PanProfile mPanProfile;
@@ -119,11 +121,17 @@
         addPanProfile(mPanProfile, PanProfile.NAME,
                 BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
 
+        if(DEBUG) Log.d(TAG, "Adding local MAP profile");
+        mMapProfile = new MapProfile(mContext, mLocalAdapter,
+                mDeviceManager, this);
+        addProfile(mMapProfile, MapProfile.NAME,
+                BluetoothMap.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");
+        if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete");
     }
 
     /**
@@ -137,7 +145,7 @@
         // A2DP
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
             if (mA2dpProfile == null) {
-                Log.d(TAG, "Adding local A2DP profile");
+                if(DEBUG) Log.d(TAG, "Adding local A2DP profile");
                 mA2dpProfile = new A2dpProfile(mContext, mLocalAdapter, mDeviceManager, this);
                 addProfile(mA2dpProfile, A2dpProfile.NAME,
                         BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
@@ -150,7 +158,7 @@
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Handsfree_AG) ||
             BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HSP_AG)) {
             if (mHeadsetProfile == null) {
-                Log.d(TAG, "Adding local HEADSET profile");
+                if (DEBUG) Log.d(TAG, "Adding local HEADSET profile");
                 mHeadsetProfile = new HeadsetProfile(mContext, mLocalAdapter,
                         mDeviceManager, this);
                 addProfile(mHeadsetProfile, HeadsetProfile.NAME,
@@ -163,7 +171,7 @@
         // OPP
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush)) {
             if (mOppProfile == null) {
-                Log.d(TAG, "Adding local OPP profile");
+                if(DEBUG) Log.d(TAG, "Adding local OPP profile");
                 mOppProfile = new OppProfile();
                 // Note: no event handler for OPP, only name map.
                 mProfileNameMap.put(OppProfile.NAME, mOppProfile);
@@ -301,7 +309,6 @@
         return mPbapProfile;
     }
 
-
     /**
      * Fill in a list of LocalBluetoothProfile objects that are supported by
      * the local device and the remote device.
@@ -354,7 +361,7 @@
         }
 
         if(isPanNapConnected)
-            Log.d(TAG, "Valid PAN-NAP connection exists.");
+            if(DEBUG) Log.d(TAG, "Valid PAN-NAP connection exists.");
         if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
             mPanProfile != null) || isPanNapConnected) {
             profiles.add(mPanProfile);
diff --git a/src/com/android/settings/bluetooth/MapProfile.java b/src/com/android/settings/bluetooth/MapProfile.java
new file mode 100644
index 0000000..fb1b180
--- /dev/null
+++ b/src/com/android/settings/bluetooth/MapProfile.java
@@ -0,0 +1,213 @@
+/*
+ * 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;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothMap;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
+import android.content.Context;
+import android.os.ParcelUuid;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MapProfile handles Bluetooth MAP profile.
+ */
+final class MapProfile implements LocalBluetoothProfile {
+    private static final String TAG = "MapProfile";
+    private static boolean V = true;
+
+    private BluetoothMap mService;
+    private boolean mIsProfileReady;
+
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+    private final LocalBluetoothProfileManager mProfileManager;
+
+    static final ParcelUuid[] UUIDS = {
+        BluetoothUuid.MAP,
+        BluetoothUuid.MNS,
+        BluetoothUuid.MAS,
+    };
+
+    static final String NAME = "MAP";
+
+    // Order of this profile in device profiles list
+
+    // These callbacks run on the main thread.
+    private final class MapServiceListener
+            implements BluetoothProfile.ServiceListener {
+
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
+            mService = (BluetoothMap) proxy;
+            // We just bound to the service, so refresh the UI for any connected MAP devices.
+            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "MapProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
+                }
+                device.onProfileStateChanged(MapProfile.this,
+                        BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
+            }
+
+            mProfileManager.callServiceConnectedListeners();
+            mIsProfileReady=true;
+        }
+
+        public void onServiceDisconnected(int profile) {
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mProfileManager.callServiceDisconnectedListeners();
+            mIsProfileReady=false;
+        }
+    }
+
+    public boolean isProfileReady() {
+        if(V) Log.d(TAG,"isProfileReady(): "+ mIsProfileReady);
+        return mIsProfileReady;
+    }
+
+    MapProfile(Context context, LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mProfileManager = profileManager;
+        mLocalAdapter.getProfileProxy(context, new MapServiceListener(),
+                BluetoothProfile.MAP);
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return true;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        if(V)Log.d(TAG,"connect() - should not get called");
+        return true; // MAP never connects out
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+        if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
+            if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+            return mService.disconnect(device);
+        } else {
+            return false;
+        }
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+        if(V) Log.d(TAG,"getConnectionStatus: status is: "+ mService.getConnectionState(device));
+
+        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
+                ? mService.getConnectionState(device)
+                : BluetoothProfile.STATE_DISCONNECTED;
+    }
+
+    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);
+            }
+        } else {
+            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
+        }
+    }
+
+    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() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return BluetoothProfile.MAP;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+        return R.string.bluetooth_profile_map;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        int state = getConnectionStatus(device);
+        switch (state) {
+            case BluetoothProfile.STATE_DISCONNECTED:
+                return R.string.bluetooth_map_profile_summary_use_for;
+
+            case BluetoothProfile.STATE_CONNECTED:
+                return R.string.bluetooth_map_profile_summary_connected;
+
+            default:
+                return Utils.getConnectionStateSummary(state);
+        }
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return R.drawable.ic_bt_cellphone;
+    }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.MAP,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up MAP proxy", t);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 9642d7c..55a0457 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -340,7 +340,7 @@
         long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000,
                 BatteryStats.STATS_SINCE_CHARGED);
         mStatsPeriod = uSecTime;
-        String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000);
+        String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000, true);
         mDurationString = getContext().getString(R.string.battery_stats_on_battery,
                 durationString);
         mChargingLabel = getContext().getString(R.string.battery_stats_charging_label);
@@ -382,7 +382,7 @@
             mHavePhoneSignal = true;
         }
         if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
-        mTotalDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart);
+        mTotalDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart, true);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index ca159dc..45e4516 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -333,7 +333,7 @@
                         mUsesGps = true;
                         // Fall through
                     default:
-                        value = Utils.formatElapsedTime(getActivity(), mValues[i]);
+                        value = Utils.formatElapsedTime(getActivity(), mValues[i], true);
                 }
                 ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text,
                         null);
diff --git a/src/com/android/settings/fuelgauge/Utils.java b/src/com/android/settings/fuelgauge/Utils.java
index 5c99a86..1ff358e 100644
--- a/src/com/android/settings/fuelgauge/Utils.java
+++ b/src/com/android/settings/fuelgauge/Utils.java
@@ -35,9 +35,13 @@
      * @param millis the elapsed time in milli seconds
      * @return the formatted elapsed time
      */
-    public static String formatElapsedTime(Context context, double millis) {
+    public static String formatElapsedTime(Context context, double millis, boolean inclSeconds) {
         StringBuilder sb = new StringBuilder();
         int seconds = (int) Math.floor(millis / 1000);
+        if (!inclSeconds) {
+            // Round up.
+            seconds += 30;
+        }
 
         int days = 0, hours = 0, minutes = 0;
         if (seconds > SECONDS_PER_DAY) {
@@ -52,15 +56,28 @@
             minutes = seconds / SECONDS_PER_MINUTE;
             seconds -= minutes * SECONDS_PER_MINUTE;
         }
-        if (days > 0) {
-            sb.append(context.getString(R.string.battery_history_days,
-                    days, hours, minutes, seconds));
-        } else if (hours > 0) {
-            sb.append(context.getString(R.string.battery_history_hours, hours, minutes, seconds));
-        } else if (minutes > 0) {
-            sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
+        if (inclSeconds) {
+            if (days > 0) {
+                sb.append(context.getString(R.string.battery_history_days,
+                        days, hours, minutes, seconds));
+            } else if (hours > 0) {
+                sb.append(context.getString(R.string.battery_history_hours,
+                        hours, minutes, seconds));
+            } else if (minutes > 0) {
+                sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
+            } else {
+                sb.append(context.getString(R.string.battery_history_seconds, seconds));
+            }
         } else {
-            sb.append(context.getString(R.string.battery_history_seconds, seconds));
+            if (days > 0) {
+                sb.append(context.getString(R.string.battery_history_days_no_seconds,
+                        days, hours, minutes));
+            } else if (hours > 0) {
+                sb.append(context.getString(R.string.battery_history_hours_no_seconds,
+                        hours, minutes));
+            } else {
+                sb.append(context.getString(R.string.battery_history_minutes_no_seconds, minutes));
+            }
         }
         return sb.toString();
     }
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 8dae1f0..87db29b 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -27,7 +27,10 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Loader;
+import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.ContentObserver;
 import android.database.DataSetObserver;
@@ -275,9 +278,14 @@
         if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {
             Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
                     ComponentName.unflattenFromString(settingsComponentName.toString()));
-            if (!getPackageManager().queryIntentActivities(settingsIntent, 0).isEmpty()) {
-                mSettingsTitle = settingsTitle;
-                mSettingsIntent = settingsIntent;
+            List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
+                    settingsIntent, 0);
+            if (!resolvedActivities.isEmpty()) {
+                // The activity is a component name, therefore it is one or none.
+                if (resolvedActivities.get(0).activityInfo.exported) {
+                    mSettingsTitle = settingsTitle;
+                    mSettingsIntent = settingsIntent;
+                }
             }
         }
 
@@ -290,9 +298,14 @@
                 && !TextUtils.isEmpty(addPrintersComponentName)) {
             Intent addPritnersIntent = new Intent(Intent.ACTION_MAIN).setComponent(
                     ComponentName.unflattenFromString(addPrintersComponentName.toString()));
-            if (!getPackageManager().queryIntentActivities(addPritnersIntent, 0).isEmpty()) {
-                mAddPrintersTitle = addPrintersTitle;
-                mAddPrintersIntent = addPritnersIntent;
+            List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
+                    addPritnersIntent, 0);
+            if (!resolvedActivities.isEmpty()) {
+                // The activity is a component name, therefore it is one or none.
+                if (resolvedActivities.get(0).activityInfo.exported) {
+                    mAddPrintersTitle = addPrintersTitle;
+                    mAddPrintersIntent = addPritnersIntent;
+                }
             }
         }
 
diff --git a/tests/res/values-en-rIN/strings.xml b/tests/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..6aab4d0
--- /dev/null
+++ b/tests/res/values-en-rIN/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"Discoverable"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Start scan"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Stop scan"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hello Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operator\'s hook that can be used to start activity of choice"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hello Manufacturer!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Manufacturer"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Manufacturer\'s hook that can be used to start activity of choice"</string>
+</resources>
diff --git a/tests/res/values-et-rEE/strings.xml b/tests/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000..ad79232
--- /dev/null
+++ b/tests/res/values-et-rEE/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"Leitav"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Käivita skannimine"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Peata skannimine"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Tere, operaator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operaator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operaatoriharki saab kasutada teie valitud tegevuse käivitamiseks"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Tere, tootja!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Tootja"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Tootjaharki saab kasutada teie valitud tegevuse käivitamiseks"</string>
+</resources>
diff --git a/tests/res/values-fr-rCA/strings.xml b/tests/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..215706f
--- /dev/null
+++ b/tests/res/values-fr-rCA/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"Identifiable"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Démarrer la recherche"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Arrêter la recherche"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hello Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Opérateur"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Accroche opérateur pouvant servir à démarrer l\'opération souhaitée"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hello Manufacturer!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabricant"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Accroche fabricant pouvant servir à démarrer l\'opération souhaitée"</string>
+</resources>
diff --git a/tests/res/values-fr/strings.xml b/tests/res/values-fr/strings.xml
index 215706f..647a343 100644
--- a/tests/res/values-fr/strings.xml
+++ b/tests/res/values-fr/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="3169265480789026010">"Identifiable"</string>
+    <string name="discoverable" msgid="3169265480789026010">"Visible"</string>
     <string name="start_scan" msgid="6035699220942169744">"Démarrer la recherche"</string>
     <string name="stop_scan" msgid="527546916633745779">"Arrêter la recherche"</string>
     <string name="operator_hello" msgid="292208161864910159">"Hello Operator!"</string>
diff --git a/tests/res/values-hy-rAM/strings.xml b/tests/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..fc0e421
--- /dev/null
+++ b/tests/res/values-hy-rAM/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"Հայտնաբերելի"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Սկսել սկանավորումը"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Դադարեցնել սկանավորումը"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Ողջու˜յն, օպերատոր:"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Օպերատոր"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Օպերատորի սլաքը կարող է օգտագործվել` ընրված գործունեությունը սկսելու համար"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Ողջու՛յն Արտադրող"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Արտադրող"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Արտադրող սլաքը կարող է օգտագործվել ընտրության գործողությունը սկսելու համար"</string>
+</resources>
diff --git a/tests/res/values-ka-rGE/strings.xml b/tests/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000..c7a0c0a
--- /dev/null
+++ b/tests/res/values-ka-rGE/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"აღმოჩენადი"</string>
+    <string name="start_scan" msgid="6035699220942169744">"სკანირების დაწყება"</string>
+    <string name="stop_scan" msgid="527546916633745779">"სკანირების გამორთვა"</string>
+    <string name="operator_hello" msgid="292208161864910159">"გამარჯობა, ოპერატორო!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"ოპერატორი"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"ოპერატორის ფანდი, რომელიც შეიძლება არჩევანის გაკეთების იძულებისთვის იქნეს გამოყენებული"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"მოგესალმებით, მწარმოებელო!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"მწარმოებელი"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"მწარმოებლის ფანდი, რომელიც შეიძლება არჩევანის გაკეთების იძულებისთვის იქნეს გამოყენებული"</string>
+</resources>
diff --git a/tests/res/values-km-rKH/strings.xml b/tests/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000..a981369
--- /dev/null
+++ b/tests/res/values-km-rKH/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"អាច​រក​ឃើញ"</string>
+    <string name="start_scan" msgid="6035699220942169744">"ចាប់ផ្ដើម​វិភាគ​រក"</string>
+    <string name="stop_scan" msgid="527546916633745779">"ឈប់​វិភាគ​រក"</string>
+    <string name="operator_hello" msgid="292208161864910159">"សួស្ដី​ប្រតិបត្តិ​ករ​បណ្ដាញ!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"ប្រតិបត្តិ​ករ"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"ការ​ភ្ជាប់​ប្រតិបត្តិ​ការ​​អាច​ត្រូវ​បា​ន​ប្រើ​ ដើម្បី​ចាប់ផ្ដើម​ជម្រើស​សកម្មភាព"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"សួស្ដី​ក្រុមហ៊ុន​ផលិត!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"ក្រុមហ៊ុន​ផលិត"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"ការ​ភ្ជាប់​ប្រតិបត្តិ​ការ​​អាច​ត្រូវ​បា​ន​ប្រើ​ ដើម្បី​ចាប់ផ្ដើម​ជម្រើស​សកម្មភាព"</string>
+</resources>
diff --git a/tests/res/values-lo-rLA/strings.xml b/tests/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000..ceddd83
--- /dev/null
+++ b/tests/res/values-lo-rLA/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"ສາມາດຖືກຊອກເຫັນໄດ້"</string>
+    <string name="start_scan" msgid="6035699220942169744">"ເລີ່ມຕົ້ນສະແກນ"</string>
+    <string name="stop_scan" msgid="527546916633745779">"ຢຸດສະແກນ"</string>
+    <string name="operator_hello" msgid="292208161864910159">"ສະບາຍດີຜູ່ໃຫ້ບໍລິການ!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"ຜູ່ໃຫ້ບໍລິການ"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"ຂໍ້ຄວາມຂອງຜູ່ໃຫ້ບໍລິການທີ່ສາມາດໃຊ້ ເພື່ອເລີ່ມການເຄື່ອນໄຫວທີ່ເລືອກໄດ້"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"ສະບາຍດີຜູ່ຜະລິດ!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"ຜູ່ຜະລິດ"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"ຂໍ້ຄວາມຂອງຜູ່ຜະລິດ ທີ່ສາມາດໃຊ້ເພື່ອເລີ່ມການເຄື່ອນໄຫວທີ່ເລືອກໄດ້"</string>
+</resources>
diff --git a/tests/res/values-mn-rMN/strings.xml b/tests/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000..60794b5
--- /dev/null
+++ b/tests/res/values-mn-rMN/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"Харагдахуйц"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Сканийг эхлүүлэх"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Сканийг зогсоох"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Сайн уу Оператор!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Оператор"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Сонголтын үйлдлийг эхлүүлэхэд ашиглаж болох операторын дэгээ"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Сайн уу Үйлдвэрлэгч ээ!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Үйлдвэрлэгч"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Сонголтын үйлдлийг эхлүүлэхэд ашиглаж болох үйлдвэрлэгчийн дэгээ"</string>
+</resources>
diff --git a/tests/res/values-ms-rMY/strings.xml b/tests/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..6ff7903
--- /dev/null
+++ b/tests/res/values-ms-rMY/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"Boleh ditemui"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Mulakan pengimbasan"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Hentikan pengimbasan"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Helo Pengendali!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Pembawa"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Pengait pengendali yang boleh digunakan untuk memulakan aktiviti pilihan"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Helo Pengeluar!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Pengeluar"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Pengait pengeluar yang boleh digunakan untuk memulakan aktiviti pilihan"</string>
+</resources>
diff --git a/tests/res/values-zh-rHK/strings.xml b/tests/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..53baa25
--- /dev/null
+++ b/tests/res/values-zh-rHK/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"可供偵測"</string>
+    <string name="start_scan" msgid="6035699220942169744">"開始掃瞄"</string>
+    <string name="stop_scan" msgid="527546916633745779">"停止掃瞄"</string>
+    <string name="operator_hello" msgid="292208161864910159">"電訊商您好!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"電訊商"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"可用來啟動所選活動的電訊商勾點"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"製造商您好!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"製造商"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"可用來啟動所選活動的製造商勾點"</string>
+</resources>