am 3d30b374: (-s ours) am 058f62ba: (-s ours) am bd044818: Import revised translations.  DO NOT MERGE

* commit '3d30b374f6cedb63d06844f6b2c7fa33f50dd77d':
  Import revised translations.  DO NOT MERGE
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e559325..e092bc9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,7 @@
 
     <original-package android:name="com.android.settings" />
 
-    <uses-permission android:name="com.google.android.gm.permission.WRITE_GMAIL" />
-    <uses-permission android:name="com.google.android.gm.permission.READ_GMAIL" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
@@ -138,7 +137,7 @@
                   android:theme="@android:style/Theme.Holo.NoActionBar"
                   android:windowBackground="@drawable/setups_bg_default"
                   android:clearTaskOnLaunch="true"
-                  android:screenOrientation="landscape"
+                  android:screenOrientation="sensorLandscape"
                   android:exported="true" />
 
         <activity-alias android:name=".wifi.AdvancedSettings"
@@ -765,6 +764,9 @@
                 android:resource="@id/storage_settings" />
         </activity>
 
+        <activity android:name=".deviceinfo.MiscFilesHandler"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
+
         <activity android:name="ApnEditor"
                 android:label="@string/apn_edit"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge">
diff --git a/res/drawable-hdpi/ic_bt_network_pan.png b/res/drawable-hdpi/ic_bt_network_pan.png
index 332d17e..dfd77fb 100644
--- a/res/drawable-hdpi/ic_bt_network_pan.png
+++ b/res/drawable-hdpi/ic_bt_network_pan.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_network_pan.png b/res/drawable-mdpi/ic_bt_network_pan.png
index d2e82c8..7d1929f 100644
--- a/res/drawable-mdpi/ic_bt_network_pan.png
+++ b/res/drawable-mdpi/ic_bt_network_pan.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/encroid_complete.png b/res/drawable-xlarge-hdpi/encroid_complete.png
index 89e45b5..6c905d4 100644
--- a/res/drawable-xlarge-hdpi/encroid_complete.png
+++ b/res/drawable-xlarge-hdpi/encroid_complete.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/encroid_progress.png b/res/drawable-xlarge-hdpi/encroid_progress.png
index 5e73dad..1e8e624 100644
--- a/res/drawable-xlarge-hdpi/encroid_progress.png
+++ b/res/drawable-xlarge-hdpi/encroid_progress.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/encroid_resignin.png b/res/drawable-xlarge-hdpi/encroid_resignin.png
index ac470f3..326a32a 100644
--- a/res/drawable-xlarge-hdpi/encroid_resignin.png
+++ b/res/drawable-xlarge-hdpi/encroid_resignin.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/encroid_waiting.png b/res/drawable-xlarge-hdpi/encroid_waiting.png
index 1090b86..9111609 100644
--- a/res/drawable-xlarge-hdpi/encroid_waiting.png
+++ b/res/drawable-xlarge-hdpi/encroid_waiting.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/encroid_complete.png b/res/drawable-xlarge-mdpi/encroid_complete.png
index 89e45b5..a550212 100644
--- a/res/drawable-xlarge-mdpi/encroid_complete.png
+++ b/res/drawable-xlarge-mdpi/encroid_complete.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/encroid_progress.png b/res/drawable-xlarge-mdpi/encroid_progress.png
index 5e73dad..0dc40c7 100644
--- a/res/drawable-xlarge-mdpi/encroid_progress.png
+++ b/res/drawable-xlarge-mdpi/encroid_progress.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/encroid_resignin.png b/res/drawable-xlarge-mdpi/encroid_resignin.png
index ac470f3..edf9fec 100644
--- a/res/drawable-xlarge-mdpi/encroid_resignin.png
+++ b/res/drawable-xlarge-mdpi/encroid_resignin.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/encroid_waiting.png b/res/drawable-xlarge-mdpi/encroid_waiting.png
index 1090b86..2104c0e 100644
--- a/res/drawable-xlarge-mdpi/encroid_waiting.png
+++ b/res/drawable-xlarge-mdpi/encroid_waiting.png
Binary files differ
diff --git a/res/layout-xlarge-land/crypt_keeper_password_entry.xml b/res/layout-xlarge-land/crypt_keeper_password_entry.xml
index f6cbecf..45a630a 100644
--- a/res/layout-xlarge-land/crypt_keeper_password_entry.xml
+++ b/res/layout-xlarge-land/crypt_keeper_password_entry.xml
@@ -45,7 +45,9 @@
         />
 
         <!-- Password entry field -->
-        <EditText android:id="@+id/passwordEntry"
+        <view
+            class="com.android.settings.CryptKeeper$CryptEditText"
+            android:id="@+id/passwordEntry"
             android:layout_height="wrap_content"
             android:layout_width="320dip"
             android:layout_toRightOf="@+id/passwordLabel"
diff --git a/res/layout-xlarge/crypt_keeper_password_entry.xml b/res/layout-xlarge/crypt_keeper_password_entry.xml
index 2da2534..0610ec0 100644
--- a/res/layout-xlarge/crypt_keeper_password_entry.xml
+++ b/res/layout-xlarge/crypt_keeper_password_entry.xml
@@ -45,7 +45,9 @@
         />
 
         <!-- Password entry field -->
-        <EditText android:id="@+id/passwordEntry"
+        <view
+            class="com.android.settings.CryptKeeper$CryptEditText"
+            android:id="@+id/passwordEntry"
             android:layout_height="wrap_content"
             android:layout_width="320dip"
             android:layout_toRightOf="@+id/passwordLabel"
diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
index 2a7da0e..9eccc69 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -52,7 +52,7 @@
         android:gravity="bottom"/>
 
     <!-- Divider -->
-    <RelativeLayout
+    <FrameLayout
         android:id="@+id/top_divider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -62,7 +62,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="?android:attr/progressBarStyleHorizontal" />
-    </RelativeLayout>
+        <View
+            android:id="@+id/top_divider_no_progress"
+            android:layout_width="match_parent"
+            android:layout_height="3dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="0dip"
+            android:background="@color/divider_color"
+            android:visibility="gone" />
+    </FrameLayout>
 
     <RelativeLayout
         android:id="@+id/content"
@@ -70,11 +78,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/top_divider"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dip"
         android:layout_marginBottom="0dip">
 
         <FrameLayout
-            android:id="@+id/wifi_setup"
+            android:id="@+id/wifi_settings_fragment_layout"
             android:layout_width="match_parent"
             android:layout_height="360dip">
             <fragment
@@ -89,28 +96,28 @@
             android:minWidth="406dip"
             android:layout_height="wrap_content"
             android:minHeight="160dip"
+            android:layout_marginTop="10dip"
             android:layout_alignParentLeft="true"
             android:visibility="gone" />
         <View
             android:id="@+id/wifi_config_padding"
             android:layout_width="match_parent"
             android:layout_height="360dip"
+            android:layout_marginTop="10dip"
             android:visibility="gone" />
         <LinearLayout
             android:id="@+id/connecting_status_layout"
             android:layout_width="match_parent"
             android:layout_height="360dip"
+            android:layout_marginTop="10dip"
             android:visibility="gone">
             <TextView
                 android:id="@+id/connecting_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:lineSpacingExtra="10dip"
-                android:inputType="textMultiLine"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="20sp"
-                android:clickable="false"
-                android:longClickable="false" />
+                android:textSize="20sp" />
         </LinearLayout>
 
     </RelativeLayout>
@@ -139,8 +146,7 @@
             style="@style/setup_wizard_button"
             android:layout_alignParentLeft="true"
             android:text="@string/wifi_setup_add_network"
-            android:enabled="false"
-            android:visibility="gone" />
+            android:enabled="false" />
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml
new file mode 100644
index 0000000..7c52efa
--- /dev/null
+++ b/res/layout/settings_storage_miscfiles.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<com.android.settings.deviceinfo.FileItemInfoLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:focusable="true">
+
+    <CheckBox android:id="@+id/misc_checkbox"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent"
+              android:layout_alignParentLeft="true"
+              android:paddingLeft="16dip"
+              android:scaleType="fitCenter"
+              android:layout_centerVertical="true"/>
+
+    <TextView android:id="@+id/misc_filename"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_toRightOf="@id/misc_checkbox"
+              android:maxLines="1"
+              android:paddingLeft="16dip"
+              android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+    <TextView android:id="@+id/misc_filesize"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_toRightOf="@id/misc_checkbox"
+              android:layout_below="@id/misc_filename"
+              android:maxLines="1"
+              android:paddingLeft="16dip"
+              android:textStyle="bold"
+              android:textAppearance="?android:attr/textAppearanceSmall" />
+</com.android.settings.deviceinfo.FileItemInfoLayout>
+
diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml
new file mode 100644
index 0000000..5f8c5ed
--- /dev/null
+++ b/res/layout/settings_storage_miscfiles_list.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingRight="16dip"
+    android:paddingLeft="16dip">
+
+    <ListView android:id="@android:id/list"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"/>
+
+</FrameLayout>
+
diff --git a/res/layout/wifi_config_preference.xml b/res/layout/wifi_config_preference.xml
index 9c1844b..913222f 100644
--- a/res/layout/wifi_config_preference.xml
+++ b/res/layout/wifi_config_preference.xml
@@ -184,84 +184,6 @@
                   android:text="@string/wifi_show_password" />
     </LinearLayout>  <!-- android:id="@+id/security_fields" -->
 
-    <LinearLayout android:id="@+id/ip_fields"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_ip_settings" />
-
-        <Spinner android:id="@+id/ip_settings"
-                 android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:prompt="@string/wifi_ip_settings"
-                 android:entries="@array/wifi_ip_settings" />
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/staticip"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_ip_address" />
-
-        <EditText android:id="@+id/ipaddress"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_gateway" />
-
-        <EditText android:id="@+id/gateway"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_network_prefix_length" />
-
-        <EditText android:id="@+id/network_prefix_length"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_dns1" />
-
-        <EditText android:id="@+id/dns1"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_dns2" />
-
-        <EditText android:id="@+id/dns2"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
         <LinearLayout android:id="@+id/proxy_settings_fields"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -279,6 +201,23 @@
                     android:entries="@array/wifi_proxy_settings" />
         </LinearLayout>
 
+        <LinearLayout android:id="@+id/proxy_warning_limited_support"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <!--  Dummy to enable right-justification of warning -->
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/proxy_warning_limited_support" />
+        </LinearLayout>
+
         <LinearLayout android:id="@+id/proxy_fields"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -315,6 +254,84 @@
                     android:inputType="textNoSuggestions" />
 
         </LinearLayout>
+
+        <LinearLayout android:id="@+id/ip_fields"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_ip_settings" />
+
+            <Spinner android:id="@+id/ip_settings"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/wifi_ip_settings"
+                android:entries="@array/wifi_ip_settings" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/staticip"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_ip_address" />
+
+            <EditText android:id="@+id/ipaddress"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_gateway" />
+
+            <EditText android:id="@+id/gateway"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_network_prefix_length" />
+
+            <EditText android:id="@+id/network_prefix_length"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_dns1" />
+
+            <EditText android:id="@+id/dns1"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_dns2" />
+
+            <EditText android:id="@+id/dns2"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index 15778ef..698ce20 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -18,33 +18,35 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent">
-    <!-- TODO: remove this once we confirm it is needless -->
-    <LinearLayout
-        android:id="@+id/wifi_general_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone">
-        <TextView android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="20sp"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
-
-        <TextView android:id="@+id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="1" />
-    </LinearLayout>
-
     <!-- UI components that should be shown appropriately -->
+    <FrameLayout android:id="@+id/eap_not_supported"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:minHeight="360dip"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+        <TextView android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:lineSpacingExtra="12dip"
+                  android:text="@string/wifi_setup_eap_not_supported"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp" />
+    </FrameLayout>
+    <!-- In "add network" flow, we have security type field (@id/security below) below
+         this View, so need a bit different layout than the other flow, in which we'll use
+         @id/eap_not_supported. -->
+    <FrameLayout android:id="@+id/eap_not_supported_for_add_network"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+        <TextView android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:lineSpacingExtra="12dip"
+                  android:text="@string/wifi_setup_eap_not_supported"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp" />
+    </FrameLayout>
     <LinearLayout android:id="@+id/wps_fields"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
@@ -163,20 +165,6 @@
                  android:gravity="left|center_vertical"/>
     </RelativeLayout> <!-- android:id="@+id/type" -->
 
-    <LinearLayout android:id="@+id/eap_not_supported"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:minHeight="360dip"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:lineSpacingExtra="12dip"
-                  android:text="@string/wifi_setup_eap_not_supported"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textSize="20sp" />
-    </LinearLayout>
-
     <!-- All the views below are "gone".
          We want them as data storage, not as UI components. -->
     <LinearLayout
@@ -322,84 +310,6 @@
                   android:text="@string/wifi_show_password" /> -->
     </LinearLayout>  <!-- android:id="@+id/security_fields" -->
 
-    <LinearLayout android:id="@+id/ip_fields"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_ip_settings" />
-
-        <Spinner android:id="@+id/ip_settings"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:prompt="@string/wifi_ip_settings"
-                 android:entries="@array/wifi_ip_settings" />
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/staticip"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_ip_address" />
-
-        <EditText android:id="@+id/ipaddress"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_gateway" />
-
-        <EditText android:id="@+id/gateway"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_network_prefix_length" />
-
-        <EditText android:id="@+id/network_prefix_length"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_dns1" />
-
-        <EditText android:id="@+id/dns1"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_dns2" />
-
-        <EditText android:id="@+id/dns2"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textNoSuggestions" />
-
         <LinearLayout android:id="@+id/proxy_settings_fields"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -418,6 +328,23 @@
                     android:entries="@array/wifi_proxy_settings" />
         </LinearLayout>
 
+        <LinearLayout android:id="@+id/proxy_warning_limited_support"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+
+                <!--  Dummy to enable right-justification of warning -->
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_warning_limited_support" />
+        </LinearLayout>
+
         <LinearLayout android:id="@+id/proxy_fields"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -454,7 +381,85 @@
                     android:inputType="textNoSuggestions" />
 
         </LinearLayout>
-    </LinearLayout>
 
+        <LinearLayout android:id="@+id/ip_fields"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_ip_settings" />
+
+            <Spinner android:id="@+id/ip_settings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/wifi_ip_settings"
+                android:entries="@array/wifi_ip_settings" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/staticip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_ip_address" />
+
+            <EditText android:id="@+id/ipaddress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_gateway" />
+
+            <EditText android:id="@+id/gateway"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_network_prefix_length" />
+
+            <EditText android:id="@+id/network_prefix_length"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_dns1" />
+
+            <EditText android:id="@+id/dns1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_dns2" />
+
+            <EditText android:id="@+id/dns2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 35ca6f0..a530a84 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -189,6 +189,67 @@
             </LinearLayout>
         </LinearLayout>
 
+        <LinearLayout android:id="@+id/proxy_settings_fields"
+                style="@style/wifi_item"
+                android:visibility="gone">
+
+            <TextView android:id="@+id/proxy_settings_title"
+                    style="@style/wifi_item_label"
+                    android:text="@string/proxy_settings_title" />
+
+            <Spinner android:id="@+id/proxy_settings"
+                    style="@style/wifi_item_content"
+                    android:prompt="@string/proxy_settings_title"
+                    android:entries="@array/wifi_proxy_settings" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/proxy_warning_limited_support"
+                    style="@style/wifi_item"
+                    android:visibility="gone">
+                <!--  Dummy to enable right-justification of warning -->
+                <TextView
+                    style="@style/wifi_item_label" />
+
+                <TextView
+                    style="@style/wifi_item_content"
+                    android:text="@string/proxy_warning_limited_support" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/proxy_fields"
+                style="@style/wifi_section"
+                android:visibility="gone">
+            <LinearLayout style="@style/wifi_item">
+                <TextView
+                        style="@style/wifi_item_label"
+                        android:text="@string/proxy_hostname_label" />
+
+                <EditText android:id="@+id/proxy_hostname"
+                        style="@style/wifi_item_content"
+                        android:singleLine="true"
+                        android:inputType="textNoSuggestions" />
+            </LinearLayout>
+            <LinearLayout style="@style/wifi_item">
+                <TextView
+                        style="@style/wifi_item_label"
+                        android:text="@string/proxy_port_label" />
+
+                <EditText android:id="@+id/proxy_port"
+                        style="@style/wifi_item_content"
+                        android:singleLine="true"
+                        android:inputType="textNoSuggestions" />
+            </LinearLayout>
+            <LinearLayout style="@style/wifi_item">
+                <TextView
+                        style="@style/wifi_item_label"
+                        android:text="@string/proxy_exclusionlist_label" />
+
+                <EditText android:id="@+id/proxy_exclusionlist"
+                        style="@style/wifi_item_content"
+                        android:singleLine="true"
+                        android:inputType="textNoSuggestions" />
+            </LinearLayout>
+        </LinearLayout>
+
         <LinearLayout android:id="@+id/ip_fields"
                 style="@style/wifi_item"
                 android:visibility="gone">
@@ -218,7 +279,7 @@
                         android:singleLine="true"
                         android:inputType="textNoSuggestions" />
             </LinearLayout>
-            
+
             <LinearLayout
                     style="@style/wifi_item" >
                 <TextView
@@ -267,54 +328,5 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout android:id="@+id/proxy_settings_fields"
-                style="@style/wifi_item"
-                android:visibility="gone">
-
-            <TextView android:id="@+id/proxy_settings_title"
-                    style="@style/wifi_item_label"
-                    android:text="@string/proxy_settings_title" />
-
-            <Spinner android:id="@+id/proxy_settings"
-                    style="@style/wifi_item_content"
-                    android:prompt="@string/proxy_settings_title"
-                    android:entries="@array/wifi_proxy_settings" />
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/proxy_fields"
-                style="@style/wifi_section"
-                android:visibility="gone">
-            <LinearLayout style="@style/wifi_item">
-                <TextView
-                        style="@style/wifi_item_label"
-                        android:text="@string/proxy_hostname_label" />
-
-                <EditText android:id="@+id/proxy_hostname"
-                        style="@style/wifi_item_content"
-                        android:singleLine="true"
-                        android:inputType="textNoSuggestions" />
-            </LinearLayout>
-            <LinearLayout style="@style/wifi_item">
-                <TextView
-                        style="@style/wifi_item_label"
-                        android:text="@string/proxy_port_label" />
-
-                <EditText android:id="@+id/proxy_port"
-                        style="@style/wifi_item_content"
-                        android:singleLine="true"
-                        android:inputType="textNoSuggestions" />
-            </LinearLayout>
-            <LinearLayout style="@style/wifi_item">
-                <TextView
-                        style="@style/wifi_item_label"
-                        android:text="@string/proxy_exclusionlist_label" />
-
-                <EditText android:id="@+id/proxy_exclusionlist"
-                        style="@style/wifi_item_content"
-                        android:singleLine="true"
-                        android:inputType="textNoSuggestions" />
-            </LinearLayout>
-        </LinearLayout>
-
     </LinearLayout>
 </ScrollView>
diff --git a/res/menu/misc_files_menu.xml b/res/menu/misc_files_menu.xml
new file mode 100644
index 0000000..80fdd2f
--- /dev/null
+++ b/res/menu/misc_files_menu.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/action_delete"
+          android:title="@string/delete"
+          android:icon="@android:drawable/ic_menu_delete"/>
+    <item android:id="@+id/action_select_all"
+          android:title="@string/select_all"
+          android:showAsAction="ifRoom" />
+</menu>
+
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
index 0cf5e46..4d117c1 100644
--- a/res/mipmap-hdpi/ic_launcher_settings.png
+++ b/res/mipmap-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
index 3c1eddf..40bdcf4 100644
--- a/res/mipmap-mdpi/ic_launcher_settings.png
+++ b/res/mipmap-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index b66bed3..9bfd89b 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"طبقة النقل الآمنة"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"دقيقتان"</item>
+    <item msgid="5780349442819375570">"5 دقائق"</item>
+    <item msgid="1166466894270177580">"ساعة واحدة"</item>
+    <item msgid="9032073376232198148">"مطلقًا"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ضعيفة"</item>
     <item msgid="5615082285463430971">"جيدة"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"لا شيء"</item>
-    <item msgid="6267482274276126058">"ثابت"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"ثابت"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"إيقاف"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"بروتوكول CHAP"</item>
     <item msgid="8383098660619805783">"بروتوكول مصادقة كلمات المرور أو بروتوكول CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"سعة تخزين الجهاز الداخلية"</item>
     <item msgid="3738430123799803530">"بطاقة SD قابلة للإزالة"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3c7742f..cb7b539 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل للاكتشاف"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"قابل للاكتشاف لمدة <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> ثانية…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"قابل للاكتشاف"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"جعل الجهاز قابل للاكتشاف"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"مهلة قابلية الاكتشاف"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"تعيين الوقت الذي يكون فيه الجهاز قابلاً للاكتشاف"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"تأمين الطلب الصوتي"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"منع استخدام طالب البلوتوث عندما تكون الشاشة مؤمّنة"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"أجهزة بلوتوث"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"هناك تطبيق يطلب الإذن لتشغيل البلوتوث. هل تريد إجراء ذلك؟"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"هناك تطبيق على الجهاز اللوحي يطلب الإذن لجعل الجهاز اللوحي قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد تنفيذ ذلك؟"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"يطلب أحد تطبيقات هاتفك إذنًا لجعل هاتفك قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد إجراء ذلك؟"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"هناك تطبيق على الجهاز اللوحي يطلب الإذن لجعل الجهاز اللوحي \"قابلاً للاكتشاف دائمًا\" بواسطة أجهزة البلوتوث الأخرى. هل تريد تنفيذ ذلك؟"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"يطلب أحد التطبيقات على هاتفك إذنًا لجعل هاتفك \"قابلاً للاكتشاف دائمًا\" بواسطة أجهزة البلوتوث الأخرى. هل تريد إجراء ذلك؟"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"هناك تطبيق على الجهاز اللوحي يطلب الإذن لتشغيل البلوتوث وجعل الجهاز اللوحي قابلاً للاكتشاف بواسطة الأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد تنفيذ ذلك؟"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"يطلب أحد تطبيقات هاتفك إذنًا لتشغيل البلوتوث وجعل هاتفك قابل للاكتشاف بواسطة أجهزة بلوتوث أخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد إجراء ذلك؟"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"هناك تطبيق على الجهاز اللوحي يطلب الإذن لتشغيل البلوتوث وجعل الجهاز اللوحي قابلاً للاكتشاف بواسطة الأجهزة الأخرى. هل تريد تنفيذ ذلك؟"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"يطلب أحد تطبيقات هاتفك إذنًا لتشغيل البلوتوث وجعل هاتفك قابلاً للاكتشاف بواسطة أجهزة بلوتوث أخرى. هل تريد إجراء ذلك؟"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"جارٍ تشغيل البلوتوث..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"اتصال تلقائي"</string>
     <string name="date_and_time" msgid="4114084177056654663">"إعدادات التاريخ والوقت"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"إعدادات الخادم الوكيل"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"تعيين خادم HTTP الوكيل وقوائم الاستبعاد"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"محو"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"المنفذ"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"المنفذ"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"لا خادم وكيل لـ"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"استعادة الإعدادات الافتراضية"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"تم"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"اسم المضيف"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"اسم المضيف"</string>
     <string name="proxy_error" msgid="8926675299638611451">"تنبيه"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"موافق"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"اسم المضيف الذي كتبته غير صحيح."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"يجب عليك إكمال حقل المنفذ."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"يجب أن يكون حقل المنفذ فارغًا إذا كان حقل المضيف فارغًا."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"المنفذ الذي كتبته غير صحيح."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"الموقع:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"تجاور CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"محاولات البيانات:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"طلب رقم تعريف شخصي رقمي لإلغاء تأمين الشاشة"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"كلمة المرور"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"طلب كلمة مرور لإلغاء تأمين الشاشة"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"معطل بواسطة مشرف جهاز التحكم عن بعد"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"معطل بواسطة مشرف جهاز التحكم عن بعد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"إيقاف"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"إلغاء الحماية"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"محمي باستخدام نقش"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"يجب أن يكون رقم التعريف الشخصي %d من الأحرف على الأقل"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"المس \"متابعة\" عند الانتهاء"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"لا يمكن أن يتجاوز رقم التعريف الشخصي أكثر من %d من الأرقام"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"لا يمكن أن يتجاوز رقم التعريف الشخصي أكثر من %d من الأرقام"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"يجب ألا يحتوي رقم التعريف الشخصي سوى على أرقام من 0 إلى 9 فقط"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"لا يسمح مشرف الجهاز باستخدام رقم تعريف شخصي مؤخر"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"تحتوي كلمة المرور على حرف غير مسموح به"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"بروتوكول CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"بروتوكول مصادقة كلمات المرور أو بروتوكول CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"نوع APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"حذف APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN جديد"</string>
     <string name="menu_save" msgid="8109345640668285399">"حفظ"</string>
@@ -726,7 +739,7 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"لمسح الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@2a5330)  -->
+    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@42b988a6)  -->
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index c574957..be35c82 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 минути"</item>
+    <item msgid="5780349442819375570">"5 минути"</item>
+    <item msgid="1166466894270177580">"1 час"</item>
+    <item msgid="9032073376232198148">"Никога"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слаб"</item>
     <item msgid="5615082285463430971">"Средна"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Няма"</item>
-    <item msgid="6267482274276126058">"Статични"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Статични"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Изкл."</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP или CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Вътрешно хранилище на устройство"</item>
     <item msgid="3738430123799803530">"SD карта, която може да се премахва"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b131f13..5fe7f02 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Откриваемо"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Откриваем за <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> секунди..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Откриваемо"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Устройството да стане откриваемо"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Време за изчакване за откриване"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Задаване на време, за което устройството ще бъде откриваемо"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заключване на гласовото набиране"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратява употребата на набирането за Bluetooth при заключен екран"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth устройства"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Приложение иска разрешение да включи Bluetooth. Искате ли да направите това?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Приложение от таблета ви иска разрешение да го направи откриваем от други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Приложение от телефона ви иска разрешение да го направи откриваем от други Bluetooth устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Приложение от таблета ви иска разрешение да го направи „постоянно откриваем“ от други Bluetooth устройства. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Приложение от телефона ви иска разрешение да го направи „постоянно откриваем“ от други Bluetooth устройства. Искате ли да направите това?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Приложение иска разрешение да включи Bluetooth и да направи таблета ви откриваем от други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Приложение от телефона ви иска разрешение да включи Bluetooth и да го направи откриваем от други Bluetooth устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Приложение от таблета ви иска разрешение да включи Bluetooth и да го направи откриваем от други устройства. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Приложение от телефона ви иска разрешение да включи Bluetooth и да го направи откриваем от други устройства. Искате ли да направите това?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth се включва..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Автоматично свързване"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки за дата и час"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Настройки за прокси сървър"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Задаване на общия HTTP прокси сървър и списъците за изключване"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Изчистване"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Порт"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Няма прокси сървър за"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Възстановяване на стандартните"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Готово"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Име на хост"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Име на хост"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Внимание"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Въведеното от вас име на хост е невалидно."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Трябва да попълните полето за порт."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Полето за порт трябва да е празно, ако полето за хост е."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Въведеният от вас порт е невалиден."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Идентификация на съседно обаждане:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Опити за данни:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Изисква се цифров PIN за отключване на екрана"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Парола"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Изисква се парола за отключване на екрана"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Деактивирано от отдалечен администратор на устройството"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Деактивирано от отдалечен администратор на устройството"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Изкл."</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Незащитено"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Защитено с фигура"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN кодът трябва да е поне %d знака"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Докоснете „Напред“, когато сте готови"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Напред"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN кодът не може да е по-дълъг от %d цифри"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN кодът не може да е по-дълъг от %d цифри"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN кодът трябва да съдържа само цифри от 0 до 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Администраторът на устройството не разрешава използването на скорошен PIN код"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Паролата съдържа непозволен знак"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP или CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Тип на името на точката за достъп (APN)"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Изтриване на името на точката за достъп (APN)"</string>
     <string name="menu_new" msgid="3014205883303921729">"Ново име на точка за достъп (APN)"</string>
     <string name="menu_save" msgid="8109345640668285399">"Запазване"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Свързването може да отнеме няколко минути..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Докоснете "<b>"Напред"</b>", за да продължите с настройката."\n\n"Докоснете "<b>"Назад"</b>", за да се свържете с друга Wi-Fi мрежа."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Настройки за синхрон"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизирането понастоящем има проблеми. Ще се върне скоро."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Добавяне на профил"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Общи настр. за синхронизиране"</string>
     <string name="background_data" msgid="5779592891375473817">"Данни на заден план"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Приложенията да синхр., пращат и получават данни винаги"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Внимание"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Деактивирането на данните на заден план удължава живота на батерията и намалява употребата на данни. Някои приложения могат пак да ползват връзката за данни на заден план."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Автоматично синхронизиране"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Автосинхронизиране на данни от приложения"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Управление на профилите"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Синхр. е ВКЛЮЧЕНО"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Грешка при синхр."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Създаване на резервно копие на настройките"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Създаване на резервно копие на настройките ми"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхрон сега"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Отказ на синхронизиране"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Докоснете, за да синхронизирате сега<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добре дошли в Google Синхронизиране!"</font>" "\n"Подходът на Google към синхронизирането на данни, за да ви осигурим достъп до контактите ви, срещите ви и много други неща, където и да сте."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Настройки за синхронизиране на приложения"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Данни и синхронизиране"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index c40203c..5a7d392 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"Dos minuts"</item>
+    <item msgid="5780349442819375570">"Cinc minuts"</item>
+    <item msgid="1166466894270177580">"Una hora"</item>
+    <item msgid="9032073376232198148">"Mai"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dolenta"</item>
     <item msgid="5615082285463430971">"Normal"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Cap"</item>
-    <item msgid="6267482274276126058">"Estàtic"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Estàtic"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desactivat"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Emmagatzematge intern del dispositiu"</item>
     <item msgid="3738430123799803530">"Targeta SD extraïble"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 94eceb2..b74b50f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectable"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectable durant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segons…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Detectable"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fes que el dispositiu es pugui detectar"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Temps durant el qual és detectable"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Defineix durant quanta estona podrà detectar-se el dispositiu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloqueja el marcatge per veu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedeix l\'ús del marcador Bluetooth quan la pantalla estigui bloquejada"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositius Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Una aplicació està sol·licitant permís per activar Bluetooth. Vols fer-ho?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Una aplicació de la tauleta sol·licita permís perquè altres dispositius puguin detectar-la durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols acceptar-ho?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Una aplicació del telèfon sol·licita permís per permetre que altres dispositius Bluetooth puguin detectar el telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Voleu permetre-ho?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Una aplicació de la tauleta sol·licita permís perquè altres dispositius amb Bluetooth puguin \"detectar-la sempre\". Vols acceptar-ho?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Una aplicació del telèfon sol·licita permís perquè altres dispositius amb Bluetooth puguin \"detectar-lo sempre\". Vols acceptar-ho?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Una aplicació de la tauleta sol·licita permís per activar Bluetooth i per fer que la tauleta sigui visible per a altres dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols acceptar-ho?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Una aplicació del telèfon sol·licita permís per activar el Bluetooth i perquè altres dispositius puguin detectar el telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Voleu permetre-ho?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Una aplicació de la tauleta sol·licita permís per activar Bluetooth i per fer que altres dispositius puguin detectar la teva tauleta. Vols acceptar-ho?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Una aplicació del telèfon sol·licita permís per activar el Bluetooth i perquè altres dispositius puguin detectar-lo. Vols permetre-ho?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"S\'està activant Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Connexió automàtica"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuració de data i hora"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Configuració del servidor intermediari"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Defineix el servidor intermediari HTTP i les llistes d\'exclusió"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Esborra"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"No hi ha servidor intermediari per a"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restauració del valors predeterminats"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Fet"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nom de l\'amfitrió"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nom de l\'amfitrió"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenció"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"D\'acord"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nom d\'amfitrió que heu escrit no és vàlid."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Heu de completar el camp del port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El camp del port ha de ser buit si el camp de l\'amfitrió és buit."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El port que heu escrit no és vàlid."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicació:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID veí:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intents de dades:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"PIN numèric per desbloquejar la pantalla"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasenya"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Contrasenya per desbloquejar la pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Desactivat per administrador remot de dispositiu"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Desactivat per administrador remot de dispositiu"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desactivat"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Sense protecció"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Assegurada mitjançant patró"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN ha de tenir almenys %d caràcters"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Quan estiguis, toca \"Continua\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"El PIN no pot tenir més de %d dígits"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no pot tenir més de %d dígits"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN només pot contenir els dígits 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"L\'administrador del dispositiu no permet utilitzar un PIN recent"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contrasenya conté un caràcter no vàlid"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipus d\'APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Suprimeix l\'APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nou"</string>
     <string name="menu_save" msgid="8109345640668285399">"Desa"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La connexió pot trigar una estona..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toca "<b>"Següent"</b>" per continuar amb la configuració."\n\n"Toca "<b>"Enrere"</b>" per connectar-te a una altra xarxa Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Configuració de sincronització"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Es tornarà a activar aviat."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Afegeix un compte"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Config. general sincronització"</string>
     <string name="background_data" msgid="5779592891375473817">"Dades de fons"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Les aplicacions poden sincronitzar, enviar i rebre dades en qualsevol moment"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Atenció"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Desactivar les dades de fons augmenta la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions encara utilitzin la connexió de dades de fons."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Sincronització automàtica"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Les aplicacions sincronitzen dades automàticament"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Gestiona comptes"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronització ACTIVADA"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Error sincron."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Còpia de seguretat de la configuració"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Fes una còpia de seguretat de la configuració"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronitza ara"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancel·la la sincronització"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Toca per sincronitzar ara <xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Calendari"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Contactes"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Benvingut a Google Sync!"</font>" "\n"La sincronització de dades que ha ideat Google per permetre l\'accés als contactes, a les cites i a molts més elements des de qualsevol lloc."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Configuració de la sincronització d\'aplicacions"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dades i sincronització"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index daf0853..c0b9af5 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minuty"</item>
+    <item msgid="5780349442819375570">"5 minut"</item>
+    <item msgid="1166466894270177580">"1 hodina"</item>
+    <item msgid="9032073376232198148">"Nikdy"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Nízká"</item>
     <item msgid="5615082285463430971">"Dostačující"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Žádné"</item>
-    <item msgid="6267482274276126058">"Statická"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statická"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Vypnuto"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP nebo CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interní úložiště zařízení"</item>
     <item msgid="3738430123799803530">"Vyjímatelná karta SD"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3ae9b80..c8cbdb1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditelné"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Zařízení je viditelné v intervalu <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Viditelné"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Přepne zařízení do viditelného režimu"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Časový limit viditelného režimu"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavit dobu, po kterou bude zařízení ve viditelném režimu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknout hlasové vytáčení"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabránit použití vytáčení Bluetooth při uzamčené obrazovce"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Zařízení Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikace požaduje povolení zapnout připojení Bluetooth. Chcete toto povolení udělit?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikace v tabletu požaduje povolení nastavit tablet na <xliff:g id="TIMEOUT">%1$d</xliff:g> s do viditelného režimu. Chcete toto povolení udělit?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikace v telefonu požaduje povolení nastavit telefon do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikace v tabletu požaduje povolení trvale nastavit tablet do viditelného režimu pro ostatní zařízení Bluetooth. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikace v telefonu požaduje povolení trvale nastavit telefon do viditelného režimu pro ostatní zařízení Bluetooth. Chcete toto povolení udělit?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikace v tabletu požaduje povolení zapnout připojení Bluetooth a nastavit tablet na <xliff:g id="TIMEOUT">%1$d</xliff:g> s do viditelného režimu. Chcete toto povolení udělit?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikace v telefonu požaduje povolení zapnout připojení Bluetooth a nastavit telefonu do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikace v tabletu požaduje povolení zapnout připojení Bluetooth a nastavit tablet do viditelného režimu pro další zařízení. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikace v telefonu požaduje povolení zapnout připojení Bluetooth a nastavit telefon do viditelného režimu pro ostatní zařízení. Chcete toto povolení udělit?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Zapínání zařízení Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatické připojení"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavení data a času"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavení serveru proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Nastavení globálního proxy serveru protokolu HTTP a seznamu vyloučení"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazat"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nepoužívat proxy server pro"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovit výchozí nastavení"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Hotovo"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Název hostitele"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Název hostitele"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Upozornění"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Zadaný název hostitele není platný."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Je třeba vyplnit pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pokud je pole hostitel prázdné, musí být prázdné i pole port."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Zadaný port není platný."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Místo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sousední identifikátor CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy dat:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Odemknutí obrazovky vyžaduje číselný kód PIN"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Odemknutí obrazovky vyžaduje heslo"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Deaktivováno vzdáleným správcem zařízení"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Deaktivováno vzdáleným správcem zařízení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Vypnuto"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Nezabezpečeno"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečeno pomocí gesta"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovat nejméně %d znaků"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Po dokončení se dotkněte tlačítka Pokračovat"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovat"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Kód PIN nemůže obsahovat více než %d číslic"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Kód PIN nemůže obsahovat více než %d číslic"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Kód PIN musí obsahovat pouze číslice 0 až 9."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Správce zařízení nepovoluje použít nedávno použitý PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Heslo obsahuje neplatný znak"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP nebo CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Typ názvu AP"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Smazat název přístupového bodu"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nový název AP"</string>
     <string name="menu_save" msgid="8109345640668285399">"Uložit"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index bd20638..499f071 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minutter"</item>
+    <item msgid="5780349442819375570">"5 minutter"</item>
+    <item msgid="1166466894270177580">"Én time"</item>
+    <item msgid="9032073376232198148">"Aldrig"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dårlig"</item>
     <item msgid="5615082285463430971">"Rimelig"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ingen"</item>
-    <item msgid="6267482274276126058">"Statisk"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statisk"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Fra"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP eller CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Intern lagring på enheden"</item>
     <item msgid="3738430123799803530">"SD-kort, der kan fjernes"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8387fe2..545b601 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Søgbar"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Søgbar i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder ..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Søgbar"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gør enheden søgbar"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Søgbar timeout"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Indstil i hvor lang tid enheden vil være søgbar"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås stemmeopkald"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Bloker brug af Bluetooth-opkald, når skærmen er låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheder"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Et program anmoder om at aktivere Bluetooth. Ønsker du at gøre dette?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Et program på tabletcomputeren kræver tilladelse til, at tabletcomputeren er synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Et program på din telefon kræver tilladelse til, at din telefon er synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"En applikation på din tablet kræver tilladelse til, at din tablet \"altid er søgbar\" for andre Bluetooth-enheder. Vil du gøre dette?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"En applikation på din telefon kræver tilladelse til, at din telefon \"altid er søgbar\" for andre Bluetooth-enheder. Vil du gøre dette?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Et program på din tabletcomputer anmoder om tilladelse til at aktivere Bluetooth, så din tabletcomputer er synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Et program på din telefon anmoder om tilladelse til at aktivere Bluetooth, så din telefon er synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"En applikation på din tablet anmoder om tilladelse til at aktivere Bluetooth, så din tablet er søgbar for andre enheder. Vil du gøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"En applikation på din telefon anmoder om tilladelse til at aktivere Bluetooth, så din telefon er søgbar for andre enheder. Vil du gøre dette?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverer Bluetooth …"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Opret automatisk forbindelse"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Indstillinger for dato og tid"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxyindstillinger"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Angiv den globale HTTP-proxy og udeladelseslister"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ryd"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Ingen proxy for"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gendan standarder"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Udført"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Værtsnavn"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Værtsnavn"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Bemærk"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Det indtastede værtsnavn er ikke gyldigt."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du skal udfylde portfeltet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Den indtastede port er ikke gyldig."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Placering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøg:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Kræv en numerisk PIN-kode til skærmoplåsning"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Adgangskode"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Kræv en adgangskode for at låse skærmen op"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Deaktiveret af fjernadministrator"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Deaktiveret af fjernadministrator"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Fra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Ikke sikret"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sikret med mønster"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Pinkoden skal være på mindst %d tegn"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Tryk på Fortsæt, når du er færdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsæt"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Pinkoden kan ikke være længere end %d cifre"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden kan ikke være længere end %d cifre"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Pinkoden må kun indeholde cifrene 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Enhedens administrator tillader ikke brug af nylig pinkode"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Adgangskoden indeholder et ulovligt tegn"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP eller CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Slet APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Ny APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Gem"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9ebf7e9..bb0e440 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 Minuten"</item>
+    <item msgid="5780349442819375570">"5 Minuten"</item>
+    <item msgid="1166466894270177580">"1 Stunde"</item>
+    <item msgid="9032073376232198148">"Nie"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Schwach"</item>
     <item msgid="5615082285463430971">"Gut"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Keiner"</item>
-    <item msgid="6267482274276126058">"Statisch"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statisch"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Aus"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP oder CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interner Gerätespeicher"</item>
     <item msgid="3738430123799803530">"Austauschbare SD-Karte"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 11684d1..30b2375 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Sichtbar"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden sichtbar..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Sichtbar"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gerät sichtbar machen"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Timeout für Sichtbarkeit"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Stellen Sie ein, wie lang das Gerät sichtbar sein soll."</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sprachwahl sperren"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Verwendung des Bluetooth-Dialers bei gesperrtem Bildschirm verhindern"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-Geräte"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Eine Anwendung beantragt eine Berechtigung zum Aktivieren von Bluetooth. Möchten Sie dies tun?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Eine Anwendung auf Ihrem Tablet beantragt die Berechtigung, Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Eine Anwendung auf Ihrem Tablet beantragt die Berechtigung, Ihr Tablet immer für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Ihr Telefon für immer für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Eine Anwendung auf Ihrem Tablet beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Telefone sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Eine Anwendung auf Ihrem Tablet beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Tablet für andere Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Telefon für andere Telefone sichtbar zu machen. Möchten Sie dies tun?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth wird aktiviert..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatische Verbindung"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp; Uhrzeit"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy-Einstellungen"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Globalen HTTP-Proxy und Ausschlusslisten festlegen"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Löschen"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Kein Proxy für"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standard wiederherstellen"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Fertigstellen"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Hostname"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Hostname"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Achtung"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Der eingegebene Hostname ist ungültig."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Sie müssen das Feld für den Port ausfüllen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Der eingegebene Port ist ungültig."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Standort:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Benachbarte CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datenversuche:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Numerische PIN zur Bildschirmentsp. erfordern"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Passwort zur Bildschirmentsperrung erfordern"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Vom Remote-Geräteadministrator deaktiviert"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Vom Remote-Geräteadministrator deaktiviert"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Aus"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Unsicher"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Durch Muster geschützt"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Die PIN muss mindestens %d Zeichen enthalten."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Wählen Sie \"Weiter\", sobald Sie fertig sind."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Weiter"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Die PIN darf maximal %d Zeichen enthalten."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Die PIN darf maximal %d Zeichen enthalten."</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN darf nur die Ziffern 0 - 9 enthalten."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Geräteadministrator lässt die Verwendung einer früheren PIN nicht zu"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Das Passwort enthält ein ungültiges Zeichen."</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP oder CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-Typ"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN löschen"</string>
     <string name="menu_new" msgid="3014205883303921729">"Neuer APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Speichern"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 24f0763..7f20c98 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 λεπτά"</item>
+    <item msgid="5780349442819375570">"5 λεπτά"</item>
+    <item msgid="1166466894270177580">"1 ώρα"</item>
+    <item msgid="9032073376232198148">"Ποτέ"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Κακό"</item>
     <item msgid="5615082285463430971">"Μέτριο"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Κανένας"</item>
-    <item msgid="6267482274276126058">"Στατικό"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Στατικό"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Απενεργοποιημένο"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ή CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Εσωτερικός χώρος αποθήκευσης της συσκευής"</item>
     <item msgid="3738430123799803530">"Αφαιρούμενη κάρτα SD"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2ff3bad..515fde2 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Ανιχνεύσιμο"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Ανιχνεύσιμο για <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> δευτερόλεπτα..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Ανιχνεύσιμη"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Να γίνει η συσκευή ανιχνεύσιμη"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Ανιχνεύσιμη λήξη ορίου χρόνου"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ρυθμίστε τον χρόνο δυνατότητας ανίχνευσης της συσκευής"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Κλείδωμα της λειτουργίας φωνητικών κλήσεων"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Να μην επιτρέπεται η χρήση του προγράμματος κλήσης bluetooth όταν η οθόνη είναι κλειδωμένη"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Συσκευές Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Μια εφαρμογή ζητά άδεια ενεργοποίησης του Bluetooth. Θέλετε να το επιτρέψετε;"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Μια εφαρμογή στο tablet σας ζητά άδεια για να καταστήσει τη συσκευή σας ορατή από άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια για καταστήσει τη συσκευή σας ορατή από άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Μια εφαρμογή στο tablet σας ζητά άδεια για να καταστήσει τη συσκευή σας \"μονίμως ορατή\" από άλλες συσκευές Bluetooth. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια για καταστήσει τη συσκευή σας \"μονίμως ορατή\" από άλλες συσκευές Bluetooth. Θέλετε να τη χορηγήσετε;"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Μια εφαρμογή στο tablet σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει τη συσκευή σας ορατή από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει τη συσκευή σας ορατή από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Μια εφαρμογή στο tablet σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει τη συσκευή σας ανιχνεύσιμη από άλλες συσκευές. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει το τηλέφωνό σας ανιχνεύσιμο από άλλες συσκευές. Θέλετε να τη χορηγήσετε;"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ενεργοποίηση Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Αυτόματη σύνδεση"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ρυθμίσεις ημερομηνίας &amp; ώρας"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Ρυθμίσεις διακομιστή μεσολάβησης"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Ορίστε το γενικό διακομιστή μεσολάβησης HTTP και τις λίστες εξαιρέσεων"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Εκκαθάριση"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Θύρα"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Θύρα"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Δεν υπάρχει διακομιστής μεσολάβησης για"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Επαναφορά προεπιλογών"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Ολοκληρώθηκε"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Όνομα κεντρικού υπολογιστή"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Όνομα κεντρικού υπολογιστή"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Προσοχή"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Το όνομα κεντρικού υπολογιστή που πληκτρολογήσατε δεν είναι έγκυρο."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Πρέπει να συμπληρώσετε το πεδίο θύρας."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Το πεδίο θύρας θα πρέπει να είναι κενό αν το πεδίο κεντρικού υπολογιστή είναι κενό."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Η θύρα που πληκτρολογήσατε δεν είναι έγκυρη."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Τοποθεσία:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Γειτονικά CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Προσπάθειες δεδομένων:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Απαιτείται PIN για ξεκλείδωμα της οθόνης"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Κωδικός πρόσβασης"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Για ξεκλείδαμα της οθόνης απαιτείται κωδικός"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Απεργοποιήθηκε από τον απομακρ. διαχειριστή"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Απεργοποιήθηκε από τον απομακρ. διαχειριστή"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Απενεργοποίηση"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Δεν έχει ασφαλιστεί"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Έχει ασφαλιστεί με μοτίβο"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Ο αριθμός PIN πρέπει να έχει τουλάχιστον %d χαρακτήρες"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Πατήστε \"Συνέχεια\" όταν τελειώσετε"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Συνέχεια"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Ο αριθμός PIN δεν μπορεί να υπερβαίνει τα %d ψηφία"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Ο αριθμός PIN δεν μπορεί να υπερβαίνει τα %d ψηφία"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Ο αριθμός PIN πρέπει να περιέχει μόνο ψηφία από το 0 έως το 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση ενός πρόσφατου PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Ο κωδικός πρόσβασης περιέχει ένα μη έγκυρο χαρακτήρα"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ή CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Τύπος APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Διαγραφή APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Νέο APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Αποθ/ση"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Η σύνδεση μπορεί να διαρκέσει αρκετά λεπτά..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Αγγίξτε το στοιχείο "<b>"Επόμενο"</b>" για να συνεχίσετε την εγκατάσταση."\n\n"Αγγίξτε το στοιχείο "<b>"Πίσω"</b>" για να συνδεθείτε σε διαφορετικό δίκτυο Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Ρυθμίσεις συγχρονισμού"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Το Sync αντιμετωπίζει προβλήματα αυτή τη στιγμή. Θα είναι διαθέσιμο ξανά σε λίγο."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Προσθήκη λογαριασμού"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Γενικές ρυθμίσεις συγχρονισμού"</string>
     <string name="background_data" msgid="5779592891375473817">"Δεδομένα φόντου"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Οι εφ/γές μπορούν να κάνουν συγχρ., αποστ. και λήψη δεδομ."</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Προσοχή"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Η απενεργοποίηση δεδομένων παρασκηνίου αυξάνει το χρόνο ζωής της μπαταρίας και μειώνει τη χρήση δεδομένων. Ορισμένες εφαρμογές ενδέχεται να συνεχίσουν να χρησιμοποιούν τη σύνδεση δεδομένων παρασκηνίου."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Αυτόματος συγχρονισμός"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Οι εφαρμογές συγχρονίζουν αυτόματα τα δεδομένα"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Διαχείριση λογαριασμών"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Συγχρ. είναι ενεργ."</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Σφάλμα συγχρονισμού"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Δημιουργία αντιγράφων ασφαλείας για τις ρυθμίσεις"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Δημιουργία αντιγράφων ασφαλείας για τις ρυθμίσεις μου"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Άμεσος συγχρονισμός"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Ακύρωση συγχρονισμού"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Πατήστε για άμεσο συγχρονισμό<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Ημερολόγιο"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Επαφές"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Καλώς ορίσατε στο Google Sync!"</font>" "\n"Μια προσέγγιση της Google στο συγχρονισμό δεδομένων, που επιτρέπει την πρόσβαση στις επαφές σας, στις συναντήσεις σας και σε άλλα στοιχεία, όπου και αν βρίσκεστε."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Ρυθμίσεις συγχρονισμού εφαρμογής"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Δεδομένα και συγχρονισμός"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index ddd8c1a..4036254 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 Minutes"</item>
+    <item msgid="5780349442819375570">"5 Minutes"</item>
+    <item msgid="1166466894270177580">"1 Hour"</item>
+    <item msgid="9032073376232198148">"Never"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Poor"</item>
     <item msgid="5615082285463430971">"Fair"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"None"</item>
-    <item msgid="6267482274276126058">"Static"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Static"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Off"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP or CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Internal device storage"</item>
     <item msgid="3738430123799803530">"Removable SD card"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d04329a..a7a24b5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Discoverable"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Discoverable for <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> seconds…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Discoverable"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Make device discoverable"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Discoverable timeout"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Set how long device will be discoverable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lock voice dialling"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth devices"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"An application is requesting permission to turn on Bluetooth. Do you want to do this?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"An application on your tablet is requesting permission to make your tablet discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"An application on your tablet is requesting permission to make your tablet “always discoverable” by other Bluetooth devices. Do you want to do this?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"An application on your phone is requesting permission to make your phone “always discoverable” by other Bluetooth devices. Do you want to do this?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"An application on your tablet is requesting permission to turn on Bluetooth and to make your tablet discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"An application on your phone is requesting permission to turn on Bluetooth and make your phone discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"An application on your tablet is requesting permission to turn on Bluetooth and to make your tablet discoverable by other devices. Do you want to do this?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices. Do you want to do this?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Turning on Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Auto-connect"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Date &amp; time settings"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy settings"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Set the global HTTP proxy and exclusion lists"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Clear"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"No Proxy for"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restore defaults"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Done"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Host name"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Host name"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Attention"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"The host name that you typed is not valid."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"You must complete the port field."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"The port that you typed is not valid."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Require a numerical PIN to unlock the screen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Require a password to unlock the screen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Disabled by remote device administrator"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Disabled by remote device administrator"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Off"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Unsecure"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Secured with pattern"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN must be at least %d characters"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Touch Continue when finished"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN can be no longer than %d digits"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN can be no longer than %d digits"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN must contain only digits 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Device administrator disallows use of a recent PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Password contains an illegal character"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP or CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN type"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Delete APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"New APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Save"</string>
diff --git a/res/values-es-rUS-xlarge/arrays.xml b/res/values-es-rUS-xlarge/arrays.xml
new file mode 100644
index 0000000..04099b3
--- /dev/null
+++ b/res/values-es-rUS-xlarge/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- XL -->
+  <string-array name="wifi_security">
+    <item msgid="8098106756841626036">"Abrir"</item>
+    <item msgid="7483225427388329117">"WEP"</item>
+    <item msgid="8071038021261720793">"WPA/WPA2 PSK"</item>
+    <item msgid="5661583279841773853">"802.1x EAP"</item>
+  </string-array>
+    <!-- XL -->
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="3900072086708522443">"Automático"</item>
+    <item msgid="340369996479905172">"Sólo 5 GHz"</item>
+    <item msgid="8972783095997098604">"Sólo 2.4 GHz"</item>
+  </string-array>
+    <!-- XL -->
+  <string-array name="screen_timeout_entries">
+    <item msgid="7251475645193927923">"15 segundos"</item>
+    <item msgid="3096271690668053645">"30 segundos"</item>
+    <item msgid="7587396843694140399">"1 min"</item>
+    <item msgid="3432725714539986129">"2 minutos"</item>
+    <item msgid="2351497979153515283">"5 minutos"</item>
+    <item msgid="6211101478382857129">"10 minutos"</item>
+    <item msgid="6022107142498163153">"30 minutos"</item>
+  </string-array>
+    <!-- XL -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="5362873482125106390">"inmediatamente"</item>
+    <item msgid="3780867917055948012">"5 segundos"</item>
+    <item msgid="5460826743422816481">"15 segundos"</item>
+    <item msgid="594626999700796913">"30 segundos"</item>
+    <item msgid="4512047639656166646">"1 min"</item>
+    <item msgid="5000428060573159180">"2 minutos"</item>
+    <item msgid="8652935668691967302">"5 minutos"</item>
+    <item msgid="7248542120979379593">"10 minutos"</item>
+    <item msgid="7877328604016083017">"30 minutos"</item>
+  </string-array>
+</resources>
diff --git a/res/values-es-rUS-xlarge/strings.xml b/res/values-es-rUS-xlarge/strings.xml
new file mode 100644
index 0000000..94555e6
--- /dev/null
+++ b/res/values-es-rUS-xlarge/strings.xml
@@ -0,0 +1,544 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- XL -->
+    <string name="sdcard_unmount" product="nosdcard" msgid="6181733313037149844">"Desmontar almacenamiento USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3220625241064789469">"Desinstalar tarjeta SD"</string>
+    <!-- XL -->
+    <string name="medium_font" msgid="7243768730537648126">"Medio"</string>
+    <!-- XL -->
+    <string name="bluetooth_scan_for_devices" msgid="2561185277445482038">"Buscar dispositivos"</string>
+    <!-- XL -->
+    <string name="bluetooth_not_connected" msgid="3244587936263217172">"Sincronizar con este dispositivo"</string>
+    <!-- XL -->
+    <string name="bluetooth_pairing" msgid="840401894618252947">"Sincronizando..."</string>
+    <!-- XL -->
+    <string name="bluetooth_paired" msgid="240792816202583985">"Sincronizado, pero no conectado"</string>
+    <!-- XL -->
+    <string name="bluetooth_notif_title" msgid="7262914492803452468">"Sincronizando solicitud"</string>
+    <!-- XL -->
+    <string name="bluetooth_ask_enablement" msgid="1018147255689867055">"Una aplicación de tu tableta solicita permiso para activar Bluetooth. ¿Deseas activarla?"</string>
+    <!-- XL -->
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="1313777388650947864">"Una aplicación de tu tableta solicita permiso para hacer que tu tableta pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5256054526438641715">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <!-- XL -->
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1639243393400460738">"Una aplicación de tu tableta solicita permiso para activar Bluetooth y hacer que tu tableta pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3143376144048362982">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth y hacer que tu teléfono pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <!-- XL -->
+    <string name="date_and_time" msgid="1715474185723734462">"Configuración de fecha &amp; hora"</string>
+    <!-- XL -->
+    <string name="proxy_settings_title" msgid="1673069489276889879">"Configuración de proxy"</string>
+    <!-- XL -->
+    <string name="proxy_action_text" msgid="6459715028082177605">"Listo"</string>
+    <!-- XL -->
+    <string name="radio_info_ping_ipaddr" msgid="5132996845195488290">"Hacer ping al IpAddr:"</string>
+    <!-- XL -->
+    <string name="radio_info_ping_hostname" msgid="3740314114100572642">"Hacer ping al nombre de host(www.google.com):"</string>
+    <!-- XL -->
+    <string name="phone_info_label" product="tablet" msgid="1256735448532460951">"Información de la tableta"</string>
+    <string name="phone_info_label" product="default" msgid="4786804657555550795">"Información del teléfono"</string>
+    <!-- XL -->
+    <string name="settings_label_launcher" msgid="3660044841861599780">"Configuración"</string>
+    <!-- XL -->
+    <string name="settings_shortcut" msgid="6696339474899813295">"Seleccionar un acceso directo para la configuración"</string>
+    <!-- XL -->
+    <string name="airplane_mode" msgid="682335907994118234">"Modo avión"</string>
+    <!-- XL -->
+    <string name="radio_controls_title" msgid="2439212533870469926">"Redes inalámbricas &amp; redes"</string>
+    <!-- XL -->
+    <string name="wireless_networks_settings_title" msgid="3355271355697831103">"Redes inalámbricas &amp; redes"</string>
+    <!-- XL -->
+    <string name="date_and_time_settings_title" msgid="1610925119073294819">"Fecha &amp; hora"</string>
+    <!-- XL -->
+    <string name="date_and_time_settings_summary" msgid="5970527077559774942">"Establecer fecha, hora, zona horaria &amp; formatos"</string>
+    <!-- XL -->
+    <string name="date_time_auto" msgid="7575618634719390063">"Fecha &amp; hora automáticas"</string>
+    <!-- XL -->
+    <string name="date_time_24hour" msgid="6849850078757557733">"Utilizar formato de 24 horas"</string>
+    <!-- XL -->
+    <string name="date_time_set_time" msgid="1003206712792772707">"Configurar hora"</string>
+    <!-- XL -->
+    <string name="date_time_set_date" msgid="8711447531767507950">"Configurar fecha"</string>
+    <!-- XL -->
+    <string name="date_time_date_format" msgid="7461449249664299378">"Seleccionar formato de fecha"</string>
+    <!-- XL -->
+    <string name="time_picker_title" msgid="4696843998853074855">"Hora"</string>
+    <!-- XL -->
+    <string name="lock_after_timeout" msgid="7600891513842005">"Tiempo de espera"</string>
+    <!-- XL -->
+    <string name="owner_info_settings_title" msgid="5868468517033834142">"Datos de propietario"</string>
+    <!-- XL -->
+    <string name="owner_info_settings_edit_text_hint" msgid="8714689633531483174">"Introduce el texto para la pantalla de bloqueo."</string>
+    <!-- XL -->
+    <string name="security_settings_title" msgid="3592400130935638009">"Seguridad &amp; ubicación"</string>
+    <!-- XL -->
+    <string name="location_security_settings_title" msgid="2760622897087864574">"Configuración de ubicación &amp; seguridad"</string>
+    <!-- XL -->
+    <!-- outdated translation 7222261825322058694 -->     <string name="lock_settings_picker_title" msgid="2690788880781812819">"Seguridad de desbloqueo de la pantalla"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_launch_picker_title" msgid="3679744779726501637">"Configurar bloqueo de pantalla"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_off_summary" msgid="7637549453338831016">"Nunca bloquear la pantalla"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_none_title" msgid="8302920869082326280">"Sin asegurar"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_none_summary" msgid="8836395154986917752">"No se necesita un patrón, PIN o contraseña para desbloquear la pantalla"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_pattern_summary" msgid="7704094261502377451">"Solicitar un patrón para desbloquear la pantalla"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_pin_summary" msgid="8765565920176739681">"Se necesita PIN numérico para desbloquear la pantalla."</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_password_summary" msgid="5551818803088356462">"Solicitar una contraseña para desbloquear la pantalla"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_disabled_summary" msgid="5962903914511361952">"Inhabilitado por el administrador remoto de la tableta"</string>
+    <!-- XL -->
+    <string name="unlock_disable_lock_title" msgid="4388312117226861970">"Desactivar bloqueo de pantalla"</string>
+    <!-- XL -->
+    <string name="unlock_change_lock_pattern_title" msgid="8720081642421556462">"Cambiar gráfico de desbloqueo"</string>
+    <!-- XL -->
+    <string name="unlock_change_lock_password_title" msgid="5574509194598366149">"Cambiar contraseña de desbloqueo"</string>
+    <!-- XL -->
+    <string name="lockpassword_illegal_character" msgid="4404339348027064222">"La contraseña tiene un carácter no admitido."</string>
+    <!-- XL -->
+    <string name="manage_device_admin" msgid="6479936342949689413">"Administradores del dispositivo."</string>
+    <!-- XL -->
+    <string name="manage_device_admin_summary" msgid="7845961601612123357">"Ver o desactivar administradores del dispositivo"</string>
+    <!-- XL -->
+    <string name="bluetooth_settings" msgid="8107038264437692653">"Configuración de Bluetooth"</string>
+    <!-- XL -->
+    <string name="bluetooth_settings_title" msgid="1587105812755318361">"Configuración de Bluetooth"</string>
+    <!-- XL -->
+    <string name="bluetooth_settings_summary" msgid="1945225217496068493">"Administrar conexiones, establecer nombre &amp; detección del dispositivo"</string>
+    <!-- XL -->
+    <string name="bluetooth_pairing_accept" msgid="7511894889564380537">"Sincronizar"</string>
+    <!-- XL -->
+    <string name="bluetooth_pairing_decline" msgid="322715418093484957">"No sincronizar"</string>
+    <!-- XL -->
+    <string name="bluetooth_pairing_rejected_error_message" msgid="4929974371411936161">"Sincronización rechazada por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <!-- XL -->
+    <string name="bluetooth_preference_scan_title" msgid="4736901133861650647">"Buscar dispositivos"</string>
+    <!-- XL -->
+    <string name="bluetooth_device_context_pair_connect" msgid="456785429134442097">"Sincronizar &amp; conectar"</string>
+    <!-- XL -->
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="5984258177855811275">"Desconectar &amp; desincronizar"</string>
+    <!-- XL -->
+    <string name="bluetooth_profile_headset" msgid="8027880654407151060">"Manos libres"</string>
+    <!-- XL -->
+    <string name="wifi_quick_toggle_summary" msgid="4327207796364453872">"Encender Wi-Fi"</string>
+    <!-- XL -->
+    <string name="wifi_settings_summary" msgid="1531844224629340571">"Configurar &amp; administrar los puntos de acceso de teléfonos inalámbricos"</string>
+    <!-- XL -->
+    <string name="wifi_starting" msgid="3998518840927475072">"Encendiendo..."</string>
+    <!-- XL -->
+    <string name="wifi_stopping" msgid="1597068456987691567">"Apagándose..."</string>
+    <!-- XL -->
+    <string name="wifi_add_network" msgid="1628543924879894494">"Agregar red Wi-Fi"</string>
+    <!-- XL -->
+    <string name="wifi_access_points" msgid="2679863921498041856">"Redes Wi-Fi"</string>
+    <!-- XL -->
+    <string name="wifi_gateway" msgid="6125453662582091251">"Puerta de enlace"</string>
+    <!-- XL -->
+    <string name="wifi_tether_settings_text" msgid="3270263236218027103">"Configuración de la zona activa Wi-Fi portátil"</string>
+    <!-- XL -->
+    <string name="wifi_tether_settings_subtext" msgid="6987791462145606369">"Configurar &amp; administrar la zona activa Wi-Fi portátil"</string>
+    <!-- XL -->
+    <string name="wifi_tether_settings_title" msgid="1163442397537759931">"Configuración de la zona activa Wi-Fi portátil"</string>
+    <!-- XL -->
+    <string name="display_settings_title" msgid="891288246221134525">"Pantalla"</string>
+    <!-- XL -->
+    <string name="silent_mode_title" msgid="1261478570389701519">"Modo silencio"</string>
+    <!-- XL -->
+    <string name="silent_mode_summary" msgid="5222199351217769201">"Silenciar todos los sonidos excepto los medios &amp; las alarmas."</string>
+    <!-- XL -->
+    <string name="vibrate_in_silent_title" msgid="6321155850445761207">"Vibración en modo silencio"</string>
+    <!-- XL -->
+    <string name="notification_sound_title" msgid="8307596933805931966">"Tono de notificación"</string>
+    <!-- XL -->
+    <string name="notification_pulse_title" msgid="1662517963585325755">"Emisión de la luz de notificación"</string>
+    <!-- XL -->
+    <string name="sound_effects_enable_title" msgid="7685254225251204074">"Selección sonora"</string>
+    <!-- XL -->
+    <string name="dock_audio_summary_none" product="tablet" msgid="2455047773318255064">"La tableta no está en la base"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="3752991668999796049">"El teléfono no se encuentra en la base"</string>
+    <!-- XL -->
+    <string name="dock_not_found_text" product="tablet" msgid="3669499294776809558">"La tableta debe estar en la base para configurar el audio de la base"</string>
+    <string name="dock_not_found_text" product="default" msgid="7992727946537528417">"El teléfono debe estar en la base para configurar el audio de la base."</string>
+    <!-- XL -->
+    <string name="dock_sounds_enable_title" msgid="8515730189986247419">"Sonido al insertar la base"</string>
+    <!-- XL -->
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="4240969084467846600">"Reproducir sonido cuando se inserte o elimine la tableta de la base."</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="2670675175363833224">"Reproducir sonido cuando se inserte o elimine un teléfono desde acoplar."</string>
+    <!-- XL -->
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="6437740762539930686">"No reproducir sonido cuando se inserte o elimine un tableta de la estación."</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="4510944311939544242">"No reproducir sonido cuando se inserte o elimine un teléfono de la estación."</string>
+    <!-- XL -->
+    <string name="sync_settings" msgid="7388802514272631256">"Cuentas &amp; sincronización"</string>
+    <!-- XL -->
+    <string name="animations_summary_on" msgid="5830579378573262644">"Mostrar animación al abrir &amp; cerrar ventanas"</string>
+    <!-- XL -->
+    <string name="animations_summary_off" msgid="2812412088253753387">"Mostrar animación al abrir &amp; cerrar ventanas"</string>
+    <!-- XL -->
+    <string name="accelerometer_title" msgid="3473695021420064579">"Girar la pantalla automáticamente"</string>
+    <!-- XL -->
+    <string name="accelerometer_summary_on" product="tablet" msgid="9163244852385491015">"Cambiar la orientación automáticamente al girar la tableta"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="643627966003934286">"Cambiar la orientación automáticamente al girar el teléfono"</string>
+    <!-- XL -->
+    <string name="accelerometer_summary_off" product="tablet" msgid="4678290739639397018">"Cambiar la orientación automáticamente al girar la tableta"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5382045890112616097">"Cambiar la orientación automáticamente al girar el teléfono"</string>
+    <!-- XL -->
+    <string name="screen_timeout" msgid="6722687152321894360">"Tiempo de espera"</string>
+    <!-- XL -->
+    <string name="sim_lock_settings_category" msgid="3725835714557961131">"Configurar bloqueo de tarjeta SIM"</string>
+    <!-- XL -->
+    <string name="sim_lock_on" product="tablet" msgid="1276225978093801721">"Se requiere PIN para utilizar la tableta"</string>
+    <string name="sim_lock_on" product="default" msgid="7944779439246994089">"Se requiere PIN para utilizar el teléfono"</string>
+    <!-- XL -->
+    <string name="sim_lock_off" product="tablet" msgid="4282321528173258005">"Se requiere PIN para utilizar la tableta"</string>
+    <string name="sim_lock_off" product="default" msgid="1727502952471674565">"Se requiere PIN para utilizar el teléfono"</string>
+    <!-- XL -->
+    <string name="device_info_settings" product="tablet" msgid="4609418231218898931">"Estado de la tableta"</string>
+    <string name="device_info_settings" product="default" msgid="3965535171546673910">"Estado del teléfono"</string>
+    <!-- XL -->
+    <string name="system_update_settings_list_item_title" msgid="1528270218415819290">"Actualizaciones del sistema"</string>
+    <!-- XL -->
+    <string name="build_number" msgid="5240350635232938488">"Crear número"</string>
+    <!-- XL -->
+    <!-- outdated translation 899895687115294054 -->     <string name="device_status_summary" product="tablet" msgid="1593450654160814122">"Número de teléfono, señal, etc."</string>
+    <string name="device_status_summary" product="default" msgid="899895687115294054">"Número de teléfono, señal, etc."</string>
+    <!-- XL -->
+    <string name="storage_settings" msgid="5625705972110860801">"Almacenamiento"</string>
+    <!-- XL -->
+    <string name="sd_eject" product="nosdcard" msgid="2291329760090260835">"Desactivar alm. comp."</string>
+    <string name="sd_eject" product="default" msgid="4218059792434713782">"Desinstalar tarjeta SD"</string>
+    <!-- XL -->
+    <string name="sd_format_summary" product="nosdcard" msgid="8577120345088226893">"Borra todos los datos del almacenamiento USB interno, como la música y las fotos"</string>
+    <string name="sd_format_summary" product="default" msgid="2457918992362105399">"Borra todos los datos de la tarjeta SD, como la música y las fotos"</string>
+    <!-- XL -->
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="7525607480940098908">"Desmontar almacenamiento USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="4564499408967738533">"Desinstalar tarjeta SD"</string>
+    <!-- XL -->
+    <string name="master_clear_title" msgid="4194091281339550954">"Restablecer datos de fábrica"</string>
+    <!-- XL -->
+    <string name="master_clear_summary" product="tablet" msgid="9210209005633768855">"Borra todos los datos de la tableta"</string>
+    <string name="master_clear_summary" product="default" msgid="936647106525403110">"Borra todos los datos del teléfono"</string>
+    <!-- XL -->
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7986099264340112418">\n\n"Para borrar la música, las imágenes y otros datos del usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="1360961377736586116">\n\n"Para borrar la música, las imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
+    <!-- XL -->
+    <string name="master_clear_button_text" product="tablet" msgid="3975362725334524231">"Restablecer tableta"</string>
+    <string name="master_clear_button_text" product="default" msgid="8395209262149378086">"Restablecer el teléfono"</string>
+    <!-- XL -->
+    <string name="master_clear_gesture_prompt" msgid="3676928144768453187">"Establece tu gráfico de desbloqueo"</string>
+    <!-- XL -->
+    <string name="master_clear_gesture_explanation" msgid="3042439365081430991">"Debes extraer tu gráfico de desbloqueo para confirmar el restablecimiento de la tableta."</string>
+    <!-- XL -->
+    <string name="media_format_final_desc" product="nosdcard" msgid="2622677755263601126">"¿Deseas borrar el almacenamiento USB y suprimir todos los archivos almacenados allí? ¡Esta acción no se puede cambiar!"</string>
+    <string name="media_format_final_desc" product="default" msgid="3543547213407695305">"¿Deseas borrar la tarjeta SD y suprimir todos los archivos almacenados allí? ¡Esta acción no se puede cambiar!"</string>
+    <!-- XL -->
+    <string name="media_format_gesture_prompt" msgid="5269018715080212198">"Establece tu gráfico de desbloqueo"</string>
+    <!-- XL -->
+    <string name="call_settings_title" msgid="838591943136606726">"Configuración de llamada"</string>
+    <!-- XL -->
+    <string name="tether_settings_summary_usb" product="tablet" msgid="7810522151323603203">"Comparte la conexión de datos para celulares de tu tableta a través de USB"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="1363698204986102517">"Comparte la conexión de datos para celulares de tu teléfono a través de USB"</string>
+    <!-- XL -->
+    <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="4178485315755192173">"Comparte conexión de datos p/ cel. de tu tableta a través de USB o como zona activa Wi-Fi portátil"</string>
+    <string name="tether_settings_summary_usb_wifi" product="default" msgid="4044134394461366035">"Comparte la conexión de datos para celulares de tu teléfono a través de USB o como zona activa Wi-Fi portátil"</string>
+    <!-- XL -->
+    <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="4467414011700016754">"Comparte la conexión de datos para celulares de tu tableta a través de USB o Bluetooth"</string>
+    <string name="tether_settings_summary_usb_bluetooth" product="default" msgid="7230529666467131797">"Comparte la conexión de datos para celulares de tu teléfono a través de USB o Bluetooth"</string>
+    <!-- XL -->
+    <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="5563702371743033831">"Comparte conexión de datos p/ cel. de tu tableta con Bluetooth o como zona activa Wi-Fi portátil"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="6393030059306414892">"Comparte la conexión de datos para celulares de tu teléfono a través de Bluetooth o como zona activa Wi-Fi portátil."</string>
+    <!-- XL -->
+    <string name="tether_settings_summary_all" product="tablet" msgid="7714876436379931592">"Comparte la conexión de datos para celulares de tu tableta a través de USB, Wi-Fi o Bluetooth"</string>
+    <string name="tether_settings_summary_all" product="default" msgid="2273985527989414830">"Comparte la conexión de datos para celulares de tu teléfono a través de USB, Wi-Fi o Bluetooth."</string>
+    <!-- XL -->
+    <string name="location_network_based" msgid="8571259791160378077">"Utilizar redes inalámbricas"</string>
+    <!-- XL -->
+    <string name="location_street_level" msgid="6486055483162410201">"Cuando se esté ubicando, sea preciso hasta el nivel de la calle."</string>
+    <!-- XL -->
+    <string name="location_gps_disabled" msgid="368445950600796860">"Localizar a nivel de calle (necesita más batería además de la vista del cielo)"</string>
+    <!-- XL -->
+    <string name="use_location_title" msgid="6603235165943700077">"Utilizar la ubicación para buscar con Google"</string>
+    <!-- XL -->
+    <string name="use_location_summary_disabled" msgid="555010365449402016">"Utilizar la ubicación para buscar con Google y otros servicios de Google"</string>
+    <!-- XL -->
+    <string name="use_location_summary_enabled" msgid="5155029913791084058">"Ubicación utilizada para mejorar los resultados de la búsqueda y otros servicios de Google"</string>
+    <!-- XL -->
+    <string name="about_settings" product="tablet" msgid="4492242295431251939">"Acerca de la tableta"</string>
+    <string name="about_settings" product="default" msgid="5642163368100089859">"Acerca del teléfono"</string>
+    <!-- XL -->
+    <string name="about_settings_summary" msgid="2127336751571543006">"Ver información legal, estado, versión de software de la tableta"</string>
+    <!-- XL -->
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="176391697191022240">"Aprende cómo utilizar tu tableta"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="696702567266318374">"Aprende cómo utilizar tu teléfono"</string>
+    <!-- XL -->
+    <string name="lockpassword_choose_your_pattern_header" msgid="1478083096563754867">"Escoge tu patrón"</string>
+    <!-- XL -->
+    <string name="lockpassword_choose_lock_generic_header" msgid="205113288645586976">"Desbloquear selección"</string>
+    <!-- XL -->
+    <string name="lock_settings_title" msgid="9000564553472290676">"Bloquear pantalla"</string>
+    <!-- XL -->
+    <string name="lockpattern_change_lock_pattern_label" msgid="4234350892820550249">"Cambiar gráfico de desbloqueo"</string>
+    <!-- XL -->
+    <string name="lockpattern_recording_intro_header" msgid="9142059965773629252">"Establecer un gráfico de desbloqueo"</string>
+    <!-- XL -->
+    <string name="lockpattern_pattern_confirmed_header" msgid="1908744990013559058">"Tu nuevo gráfico de desbloqueo:"</string>
+    <!-- XL -->
+    <string name="lockpattern_settings_enable_summary" msgid="1456211092062050289">"Debes extraer el patrón para desbloquear la pantalla"</string>
+    <!-- XL -->
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="554387666060565792">"Utilizar patrón visible"</string>
+    <!-- XL -->
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="9092475391999414878">"Utilizar respuesta táctil"</string>
+    <!-- XL -->
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="3477319366008177548">"Configurar gráfico de desbloqueo"</string>
+    <!-- XL -->
+    <string name="lockpattern_settings_change_lock_pattern" msgid="807557015335006719">"Cambiar gráfico de desbloqueo"</string>
+    <!-- XL -->
+    <string name="lockpattern_settings_help_how_to_record" msgid="2679593325847484412">"Cómo dibujar un gráfico de desbloqueo"</string>
+    <!-- XL -->
+    <string name="lock_title" product="tablet" msgid="9166767874243041429">"Protección de tu tableta"</string>
+    <string name="lock_title" product="default" msgid="1092944886413119561">"Asegurando tu teléfono"</string>
+    <!-- XL -->
+    <string name="lock_intro_message" product="tablet" msgid="4721776268392533907">"Protege tu tableta del uso no autorizado creando un gráfico de desbloqueo de pantalla personal. Usa el dedo para unir los puntos en cualquier orden en la pantalla. Debes unir al menos cuatro puntos. "\n\n"¿Listo para comenzar? Toca “Siguiente”."</string>
+    <string name="lock_intro_message" product="default" msgid="907038783986041076"><font size="17">"Protege a tu teléfono de usos no autorizados al crear un gráfico de desbloqueo en la pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la pantalla siguiente, observa cómo se establece un gráfico de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés listo, establece tu propio gráfico de desbloqueo personal. Experimenta con diferentes gráficos pero conecta al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Revisa tu gráfico para confirmar. "\n<font height="17">\n</font><b>"¿Estás listo para comenzar? Toca \"Siguiente\""</b>". "\n<font height="3">\n</font>"Si deseas dejar sin protección a tu teléfono, toca \"Cancelar\"."</font></string>
+    <!-- XL -->
+    <string name="applications_settings_header" msgid="7998404736890425408">"Configuración de aplicación"</string>
+    <!-- XL -->
+    <string name="install_unknown_applications" msgid="5523436660596740637">"Permite la instalación de aplicaciones que no pertenezcan a Tienda"</string>
+    <!-- XL -->
+    <string name="install_all_warning" product="tablet" msgid="5048087898876117901">"Tu tableta y datos personales son más vulnerables a sufrir ataques de aplicaciones provenientes de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño que sufra tu tableta o de cualquier pérdida de datos que pueda ocasionar el uso de estas aplicaciones."</string>
+    <string name="install_all_warning" product="default" msgid="8051207775052950715">"Tu teléfono y datos personales son más vulnerables a sufrir ataques de aplicaciones provenientes de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño que sufra tu teléfono o de cualquier pérdida de datos que pueda ocasionar el uso de estas aplicaciones."</string>
+    <!-- XL -->
+    <string name="storage_label" msgid="721825759391089611">"Almacenamiento"</string>
+    <!-- XL -->
+    <string name="auto_launch_label" msgid="952095110510946762">"Ejecutar de forma predeterminada"</string>
+    <!-- XL -->
+    <string name="force_stop" msgid="8640872458052681478">"Provocar la detención"</string>
+    <!-- XL -->
+    <string name="uninstall_text" msgid="4025039762527439329">"Desinstalar"</string>
+    <!-- XL -->
+    <string name="security_settings_desc" product="tablet" msgid="9213000088515475700">"Esta aplicación puede acceder a lo siguiente en tu tableta:"</string>
+    <string name="security_settings_desc" product="default" msgid="6170390933313935985">"Esta aplicación puede acceder a lo siguiente en tu teléfono:"</string>
+    <!-- XL -->
+    <string name="move_app_to_internal" product="tablet" msgid="3087556251205296105">"Mover a la tableta"</string>
+    <string name="move_app_to_internal" product="default" msgid="4683272575835299333">"Mover al teléfono"</string>
+    <!-- XL -->
+    <string name="force_stop_dlg_title" msgid="1073476967469219114">"Provocar la detención"</string>
+    <!-- XL -->
+    <string name="running_processes_item_description_p_s" msgid="6016515454264324121">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
+    <!-- XL -->
+    <string name="service_manage" msgid="6150785653738071102">"Configuración"</string>
+    <!-- XL -->
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5330727138762830508">"¿Estás seguro de que deseas detener el servicio del sistema? Si lo haces, algunas funciones de tu tableta podrían dejar de ejecutarse correctamente hasta que la apagues y enciendas nuevamente."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6840410545044552506">"¿Estás seguro de que deseas detener el servicio del sistema? Si lo haces, algunas funciones de tu teléfono podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
+    <!-- XL -->
+    <string name="language_settings" msgid="8904228615052580661">"Idioma &amp; entrada"</string>
+    <!-- XL -->
+    <string name="language_keyboard_settings_title" msgid="3826317747930581490">"Idioma &amp; entrada"</string>
+    <!-- XL -->
+    <string name="auto_replace" msgid="2972453466301833766">"Reemplazar automáticamente"</string>
+    <!-- XL -->
+    <string name="auto_caps" msgid="1349585249132014166">"Uso de mayúsculas automático"</string>
+    <!-- XL -->
+    <string name="testing_phone_info" product="tablet" msgid="9128283157166365872">"Información de la tableta"</string>
+    <string name="testing_phone_info" product="default" msgid="8368042652385895322">"Información del teléfono"</string>
+    <!-- XL -->
+    <string name="quick_launch_summary" msgid="8680015390756527810">"Establecer métodos abreviados de teclado para lanzar aplicaciones"</string>
+    <!-- XL -->
+    <string name="keep_screen_on" msgid="6685373812866219183">"Mantener activa"</string>
+    <!-- XL -->
+    <string name="allow_mock_location" msgid="8337884419688998284">"Permitir ubicaciones simuladas"</string>
+    <!-- XL -->
+    <string name="allow_mock_location_summary" msgid="8221368721502475488">"Permitir ubicaciones simuladas"</string>
+    <!-- XL -->
+    <string name="battery_history_days" msgid="6388963237495315461">"<xliff:g id="DAYS">%1$d</xliff:g>días <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>min <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <!-- XL -->
+    <string name="battery_history_hours" msgid="1864714660768076601">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>min <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <!-- XL -->
+    <string name="battery_history_minutes" msgid="904790647144376065">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <!-- XL -->
+    <string name="battery_history_seconds" msgid="3665349590312523082">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
+    <!-- XL -->
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="6700381643398366558">"Algunas aplicaciones pueden solicitar que Google descargue scripts a tu tableta para hacer más accesible su contenido. ¿Estás seguro de que quieres permitir que Google instale scripts de accesibilidad en tu tableta?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="5442302097021173031">"Algunas aplicaciones pueden solicitar que Google descargue scripts a tu teléfono para hacer más accesible su contenido. ¿Estás seguro de que quieres permitir que Google instale scripts de accesibilidad en tu teléfono?"</string>
+    <!-- XL -->
+    <string name="details_title" msgid="5089499312993127089">"Utilizar detalles"</string>
+    <!-- XL -->
+    <string name="power_idle" product="tablet" msgid="8117801758410646708">"Tableta ausente"</string>
+    <string name="power_idle" product="default" msgid="3337610844756425131">"Teléfono inactivo"</string>
+    <!-- XL -->
+    <string name="battery_action_stop" msgid="5203139623674829450">"Provocar la detención"</string>
+    <!-- XL -->
+    <string name="battery_action_app_settings" msgid="6095037590992693768">"Configuración de aplicación"</string>
+    <!-- XL -->
+    <string name="battery_action_bluetooth" msgid="853528034605826496">"Configuración de Bluetooth"</string>
+    <!-- XL -->
+    <string name="battery_desc_standby" product="tablet" msgid="5473666863365332447">"La batería se utiliza cuando la tableta está inactiva"</string>
+    <string name="battery_desc_standby" product="default" msgid="2197999446645143507">"La batería se utiliza cuando el teléfono está inactivo"</string>
+    <!-- XL -->
+    <string name="battery_sugg_apps_gps" msgid="2003155161828900770">"Controla manualmente el GPS para que la aplicación no lo use."</string>
+    <!-- XL -->
+    <string name="voice_input_output_settings" msgid="1559584883190087877">"Entrada &amp; salida de voz"</string>
+    <!-- XL -->
+    <string name="voice_input_output_settings_title" msgid="650779670494513011">"Configuración de entrada y salida de voz"</string>
+    <!-- XL -->
+    <string name="voice_input_category" msgid="6409471746439542556">"Entrada de voz"</string>
+    <!-- XL -->
+    <string name="recognizer_settings_title" msgid="6114971041507760293">"Configuración del reconocedor de voz"</string>
+    <!-- XL -->
+    <string name="tts_settings_title" msgid="6637716247707110736">"Configuración de texto de voz"</string>
+    <!-- XL -->
+    <string name="use_default_tts_settings_title" msgid="5306939106240140474">"Utilizar siempre mi configuración"</string>
+    <!-- XL -->
+    <string name="tts_default_rate_title" msgid="976403399602850472">"Velocidad de voz"</string>
+    <!-- XL -->
+    <string name="tts_play_example_title" msgid="3789445594548626958">"Escucha un ejemplo"</string>
+    <!-- XL -->
+    <string name="tts_engine_name_is_disabled_summary" msgid="3336669129361332481">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está inhabilitado."</string>
+    <!-- XL -->
+    <string name="vpn_menu_delete" msgid="4916522121879342228">"Suprimir red"</string>
+    <!-- XL -->
+    <string name="vpn_dns_search_list_title" msgid="4541049212952610939">"Dominios de búsqueda de DNS"</string>
+    <!-- XL -->
+    <string name="vpn_is_enabled" msgid="7983866862437815600">"<xliff:g id="OPTION">%s</xliff:g> está habilitado."</string>
+    <!-- XL -->
+    <string name="vpn_is_disabled" msgid="2992826944244218888">"<xliff:g id="OPTION">%s</xliff:g> está inhabilitado."</string>
+    <!-- XL -->
+    <string name="vpn_settings_summary" msgid="813124993643276598">"Establecer &amp; administrar Redes privadas virtuales (VPN)"</string>
+    <!-- XL -->
+    <string name="credentials_access" msgid="4979934961780740364">"Utilizar credenciales seguras"</string>
+    <!-- XL -->
+    <string name="credentials_install_certificates" product="nosdcard" msgid="6544302303222468077">"Instalar desde almacenamiento USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="6102468185992800407">"Instalar desde la tarjeta SD"</string>
+    <!-- XL -->
+    <string name="encrypted_fs_enable_button" msgid="5517966150893551199">"Habilitar"</string>
+    <!-- XL -->
+    <string name="encrypted_fs_disable_button" msgid="5723342350828112970">"Inhabilitar"</string>
+    <!-- XL -->
+    <string name="backup_data_summary" msgid="1336378642693518890">"Copias de seguridad de los datos de la aplicación, de las contraseñas de Wi-Fi y otra configuración en los servidores de Google"</string>
+    <!-- XL -->
+    <string name="backup_configure_account_default_summary" msgid="6098490331238505056">"No existe una cuenta que esté almacenando datos con copia de seguridad."</string>
+    <!-- XL -->
+    <string name="auto_restore_title" msgid="6131625376900473183">"Restauración automática"</string>
+    <!-- XL -->
+    <string name="backup_erase_dialog_message" msgid="420760487469699485">"¿Estás seguro de que deseas dejar de hacer copias de seguridad de tus contraseñas de Wi-Fi, favoritos y otros datos de configuración y aplicaciones, y borrar todas las copias de los servidores de Google?"</string>
+    <!-- XL -->
+    <!-- outdated translation 459632371726748549 -->     <string name="wifi_setup_title" msgid="7213494455033152368">"Configuración de Wi-Fi"</string>
+    <!-- XL -->
+    <string name="wifi_setup_status_select_network" msgid="2849893362484510765">"Toca una red para conectarte a ella"</string>
+    <!-- XL -->
+    <string name="wifi_setup_status_eap_not_supported" msgid="2580119613877986130">"EAP no admitido"</string>
+    <!-- XL -->
+    <string name="wifi_setup_eap_not_supported" msgid="518966154814708106">"No puedes configurar la conexión Wi-Fi de EAP durante la instalación. Después de la configuración, puedes hacerlo en Configuraciones, en Redes inalámbricas &amp; redes."</string>
+    <!-- XL -->
+    <string name="background_data_summary" msgid="1261820775251511583">"Las aplic. pueden sinc., env. y recibir datos en cualq. mom."</string>
+    <!-- XL -->
+    <string name="really_remove_account_message" product="tablet" msgid="812472619471595089">"¿Realmente deseas eliminar·esta cuenta? Si lo haces, también suprimirás todos sus mensajes, contactos y otros datos de la tableta. "\n"¿Deseas continuar?"</string>
+    <string name="really_remove_account_message" product="default" msgid="6592950875510640653">"¿Realmente deseas eliminar·esta cuenta? Si lo haces, también suprimirás todos sus mensajes, contactos y otros datos del teléfono. "\n"¿Deseas continuar?"</string>
+    <!-- XL -->
+    <string name="bluetooth_notif_message" msgid="2611095882015030198">"Seleccionar para vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <!-- XL -->
+    <string name="bluetooth_auto_connect" msgid="5635834571497957651">"Conectar automáticamente"</string>
+    <!-- XL -->
+    <string name="lock_after_timeout_summary" msgid="1115580514157023005">"Bloquear pantalla <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> luego de que la pantalla se apague automáticamente"</string>
+    <!-- XL -->
+    <string name="encryption_settings_title" msgid="2646733014286658918">"Encriptación del dispositivo"</string>
+    <!-- XL -->
+    <string name="encrypt_title" msgid="6588721799092579532">"Encriptar datos en el dispositivo"</string>
+    <!-- XL -->
+    <string name="encrypt_summary" msgid="8034174282555891811">"Debes configurar un número de PIN o contraseña para desbloquear el dispositivo"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_mode_off" msgid="3083317055441778577">"Apagado"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_mode_none" msgid="2265502443989071295">"Sin asegurar"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_mode_pattern" msgid="891892061776325935">"Asegurado con patrón"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_mode_pin" msgid="948449971660341581">"Asegurado con número de PIN"</string>
+    <!-- XL -->
+    <string name="unlock_set_unlock_mode_password" msgid="527487918702728081">"Asegurado con contraseña"</string>
+    <!-- XL -->
+    <string name="lockpattern_tutorial_cancel_label" msgid="8891383231976441554">"Cancelar"</string>
+    <!-- XL -->
+    <string name="lockpattern_tutorial_continue_label" msgid="607092788342282292">"Siguiente"</string>
+    <!-- XL -->
+    <string name="bluetooth_enter_pin_msg" msgid="4795866589006598648">\n"Ingresa el PIN para vincularse con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Intenta con 0000 ó 1234). Es posible que debas ingresar el mismo PIN en el dispositivo Bluetooth."</string>
+    <!-- XL -->
+    <string name="bluetooth_enter_passkey_msg" msgid="5281098098369174842">\n"Ingresa la llave maestra para vincular con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <!-- XL -->
+    <string name="bluetooth_display_passkey_pin_msg" msgid="4517875819897263465">"Ingresa la \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" en tu \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para sincronizar y luego return (volver) o enter (aceptar)."</string>
+    <!-- XL -->
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="8558839213545432142">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de medios."</string>
+    <!-- XL -->
+    <string name="bluetooth_disconnect_headset_profile" msgid="7632141632739822572">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libre."</string>
+    <!-- XL -->
+    <string name="bluetooth_disconnect_hid_profile" msgid="1679676194011650565">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
+    <!-- XL -->
+    <string name="bluetooth_disconnect_pan_profile" msgid="7327390610936860378">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del anclaje."</string>
+    <!-- XL -->
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="7152329494274254683">"Utilizar para acceso a Internet"</string>
+    <!-- XL -->
+    <string name="screen_timeout_summary" msgid="8423734042860540453">"La pantalla se apaga automáticamente después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <!-- XL -->
+    <string name="memory_calculating_size" msgid="4994844259856032553">"Calculando…"</string>
+    <!-- XL -->
+    <string name="current_input_method" msgid="1106006204280275670">"Método de entrada actual"</string>
+    <!-- XL -->
+    <string name="input_method_selector" msgid="4603564747071938112">"Selector de método de entrada"</string>
+    <!-- XL -->
+    <string name="input_method_selector_show_automatically_title" msgid="1706737268175339595">"Automático"</string>
+    <!-- XL -->
+    <string name="input_method_selector_always_show_title" msgid="3708432810001453807">"Mostrar siempre"</string>
+    <!-- XL -->
+    <string name="input_method_selector_always_hide_title" msgid="4836415734240597745">"Ocultar siempre"</string>
+    <!-- XL -->
+    <string name="configure_input_method" msgid="6026015289285751240">"Configurar métodos de entrada"</string>
+    <!-- XL -->
+    <string name="input_method_settings" msgid="9024293785411698203">"Configuración"</string>
+    <!-- XL -->
+    <string name="active_input_method_subtypes" msgid="5725808834287911653">"Métodos de entrada activos"</string>
+    <!-- XL -->
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="6563524811468810194">"Usar el idioma del sistema"</string>
+    <!-- XL -->
+    <string name="input_methods_and_subtype_enabler_title" msgid="2847364292968799808">"Seleccionar métodos de entrada activos"</string>
+    <!-- XL -->
+    <string name="history_details_title" msgid="8910742461149938017">"Detalles del historial"</string>
+    <!-- XL -->
+    <string name="vpn_details_title" msgid="2756802240544287896">"Detalles de VPN"</string>
+    <!-- XL -->
+    <string name="settings_backup_summary" msgid="111187787880535545">"Realizar copia de seguridad de mi configuración"</string>
+    <!-- XL -->
+    <string name="sync_one_time_sync" msgid="7494419538560558301">"Tocar para sincronizar ahora<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>"</string>
+    <!-- XL -->
+    <string name="sync_plug" msgid="3462111668444144965"><font fgcolor="#ffffffff">"¡Bienvenido a Google sync!"</font>" "\n"Un método de Google que sincroniza datos para permitir el acceso a tus contactos, citas y mucho más desde cualquier lugar donde estés."</string>
+    <!-- XL -->
+    <string name="header_application_sync_settings" msgid="6437837277802783145">"Config. de sincroniz. de la aplic."</string>
+    <!-- XL -->
+    <string name="header_data_and_synchronization" msgid="506768433213665971">"Sincronización &amp; datos"</string>
+    <!-- XL -->
+    <string name="preference_change_password_title" msgid="4912535804788535201">"Cambiar contraseña"</string>
+    <!-- XL -->
+    <string name="header_account_settings" msgid="6867837572336802076">"Configuración de la cuenta"</string>
+    <!-- XL -->
+    <string name="remove_account_label" msgid="4367473583514778695">"Eliminar cuenta"</string>
+    <!-- XL -->
+    <string name="header_add_an_account" msgid="5117101576908916159">"Agregar una cuenta"</string>
+    <!-- XL -->
+    <string name="finish_button_label" msgid="1346555381324556167">"Finalizar"</string>
+    <!-- XL -->
+    <string name="really_remove_account_title" msgid="6530859245072522666">"Eliminar cuenta"</string>
+    <!-- XL -->
+    <string name="remove_account_failed" product="tablet" msgid="2043864489637138343">"Algunas aplicaciones requieren esta cuenta. Sólo puedes suprimirla si restableces la configuración predeterminada de fábrica en la tableta (esta acción suprime todos tus datos personales). Puedes hacerlo en la aplicación Configuración, dentro de Privacidad."</string>
+    <string name="remove_account_failed" product="default" msgid="900970657285357323">"Algunas aplicaciones requieren esta cuenta. Sólo puedes suprimirla si restableces la configuración predeterminada de fábrica en el teléfono (la cual suprime todos tus datos personales). Puedes hacerlo en la aplicación Configuración, dentro de Privacidad."</string>
+    <!-- XL -->
+    <string name="provider_label" msgid="5253020684282273567">"Suscripciones de inserción"</string>
+    <!-- XL -->
+    <string name="sync_item_title" msgid="6895422961712326561">"Sincronización<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- XL -->
+    <string name="cant_sync_dialog_title" msgid="5549345079325238269">"No se puede realizar la sincronización manual"</string>
+    <!-- XL -->
+    <string name="cant_sync_dialog_message" msgid="1447798364019734634">"La sincronización de este elemento actualmente está desactivada. Para cambiar tus preferencias, activa momentáneamente los datos de fondo y la sincronización automática."</string>
+</resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 7dcf15d..1db054e 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 Minutos"</item>
+    <item msgid="5780349442819375570">"5 Minutos"</item>
+    <item msgid="1166466894270177580">"1 hora"</item>
+    <item msgid="9032073376232198148">"Nunca"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Baja calidad"</item>
     <item msgid="5615082285463430971">"Aceptable"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ninguno"</item>
-    <item msgid="6267482274276126058">"Estático"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Estático"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Apagado"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Dispositivo de almacenamiento interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD desmontable"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 41749ea..77ab771 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visible durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Visible"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer que el dispositivo sea visible"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tiempo de espera detectable"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Configurar el tiempo durante el que el dispositivo será detectable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir el uso de Bluetooth del teléfono cuando la pantalla esté bloqueada."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos de Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Una aplicación de tu tablet solicita permiso para activar Bluetooth. ¿Deseas activarlo?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Una aplicación de tu tablet solicita permiso para hacer que tu tablet pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Una aplicación de tu tableta solicita permiso para hacer que tu tableta pueda ser \"siempre detectable\" por otros dispositivos de Bluetooth. ¿Deseas hacer esto?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser \"siempre detectable\" por otros dispositivos de Bluetooth. ¿Deseas hacer esto?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Una aplicación de tu tablet solicita permiso para activar Bluetooth y hacer que tu tablet pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth y hacer que tu teléfono pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Una aplicación de tu tableta solicita permiso para activar Bluetooth y hacer que tu tableta pueda ser detectable por otros dispositivos. ¿Deseas hacer esto?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth y hacer que tu teléfono pueda ser detectable por otros dispositivos. ¿Deseas hacer esto?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activando Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Conectar automáticamente"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuración de fecha y hora"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Configuración de proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Establece el proxy HTTP global y las listas de exclusión"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Puerto"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Puerto"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"No hay proxy para"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar configuraciones predeterminadas"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Finalizado"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nombre del servidor"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nombre del servidor"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atención"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nombre del servidor que has escrito no es válido."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo del puerto debe estar vacío si el campo de servidor está vacío."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El puerto que has escrito no es válido."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID cercano:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Requieren un PIN numérico para desbloquear la pantalla"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Solicitar una contraseña para desbloquear la pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Inhabilitado por el administrador remoto del tablet"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Inhabilitado por el administrador remoto del tablet"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desactivado"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Sin seguros"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Asegurado con el patrón"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe tener al menos %d caracteres."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Toca Continuar cuando hayas finalizado"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"El PIN no puede tener más de %d dígitos."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no puede tener más de %d dígitos."</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN debe contener de 0 a 9 dígitos únicamente."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"El administrador de dispositivos no permite utilizar un PIN reciente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contraseña tiene un caracter no admitido."</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo de APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nuevo"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index c272ca1..390cc8b 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minutos"</item>
+    <item msgid="5780349442819375570">"5 minutos"</item>
+    <item msgid="1166466894270177580">"Una hora"</item>
+    <item msgid="9032073376232198148">"Nunca"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Mala"</item>
     <item msgid="5615082285463430971">"Aceptable"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ninguno"</item>
-    <item msgid="6267482274276126058">"Estático"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Estático"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desconectado"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Almacenamiento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD extraíble"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2673081..c51c8ad 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visible durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Visible"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer visible el dispositivo"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tiempo de espera de visibilidad del dispositivo"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir cuánto tiempo estará visible el dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar el uso del marcador a través de Bluetooth cuando la pantalla esté bloqueada"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Una aplicación está solicitando permiso para activar la función Bluetooth. ¿Aceptas?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Una aplicación de la tableta está solicitando permiso para hacer visible la tableta para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Aceptas?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Una aplicación del teléfono está solicitando permiso para hacer visible el teléfono para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Una aplicación de la tableta está solicitando permiso para hacer que la tableta siempre esté visible para otros dispositivos Bluetooth. ¿Aceptas?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Una aplicación del teléfono está solicitando permiso para hacer que el teléfono esté siempre visible para otros dispositivos Bluetooth. ¿Aceptas?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Una aplicación de la tableta está solicitando permiso para activar la función Bluetooth y hacer visible la tableta para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Una aplicación del teléfono está solicitando permiso para activar la función Bluetooth y hacer visible el teléfono para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Una aplicación de la tableta está solicitando permiso para activar la función Bluetooth y hacer visible la tableta para otros dispositivos. ¿Aceptas?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Una aplicación del teléfono está solicitando permiso para activar la función Bluetooth y hacer visible el teléfono para otros dispositivos. ¿Aceptas?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activando Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Conexión automática"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ajustes de fecha y hora"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Ajustes de proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Definir el proxy HTTP global y las listas de exclusión"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Puerto"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Puerto"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Sin proxy para"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar valores predeterminados"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Listo"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nombre de host"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nombre de host"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atención"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nombre de host introducido no es válido."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de portal debe estar vacío si el campo de host también lo está."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El puerto introducido no es válido."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID anexo"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"PIN numérico para desbloquear la pantalla"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Contraseña para desbloquear la pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Inhabilitado por admin de dispositivo remoto"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Inhabilitado por admin de dispositivo remoto"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desactivado"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Sin protección"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegida con patrón"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe contener al menos %d caracteres."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Tocar Continuar al terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"El PIN no puede tener más de %d dígitos."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no puede tener más de %d dígitos."</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN solo debe contener dígitos comprendidos entre el cero y el nueve."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Administrador de dispositivos no permite usar PIN reciente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contraseña contiene un carácter no permitido."</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo de APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nuevo"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 8798524..122c391 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 دقیقه"</item>
+    <item msgid="5780349442819375570">"5 دقیقه"</item>
+    <item msgid="1166466894270177580">"1 ساعت"</item>
+    <item msgid="9032073376232198148">"هیچوقت"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ضعیف"</item>
     <item msgid="5615082285463430971">"متعادل"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"هیچکدام"</item>
-    <item msgid="6267482274276126058">"آمار"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"آمار"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"خاموش"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP یا CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"دستگاه ذخیره سازی داخلی"</item>
     <item msgid="3738430123799803530">"کارت SD جدا شدنی"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2d484f1..b203e68 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل شناسایی"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"قابل شناسایی برای <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> ثانیه..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"قابل شناسایی"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"دستگاه قابل شناسایی شود"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"پایان زمان قابلیت شناسایی"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"مدت زمان قابل شناسایی بودن دستگاه را تنظیم کنید"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"قفل کردن شماره گیری صوتی"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ممانعت از استفاده شماره گیر بلوتوث هنگام قفل شدن صفحه"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"دستگاه های بلوتوث"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"برنامه ای درخواست کرده است که بلوتوث روشن شود. می خواهید این کار را انجام دهید؟"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"برنامه ای در رایانه لوحی شما درخواست کرده است که رایانه لوحی شما برای <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه برای دیگر دستگاه های بلوتوث قابل شناسایی باشد. می خواهید این کار را انجام دهید؟"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"برنامه ای در گوشی شما درخواست کرده است که گوشی شما برای <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه برای دیگر دستگاه های بلوتوث قابل شناسایی باشد. می خواهید این کار را انجام دهید؟"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"یک برنامه کاربردی در رایانه لوحی شما درخواست اجازه کرده است که رایانه لوحی شما را برای سایر دستگاه های بلوتوث \"همیشه قابل شناسایی\" کند. می خواهید این کار را انجام دهید؟"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"یک برنامه کاربردی در تلفن شما درخواست اجازه کرده است که تلفن شما را برای سایر دستگاه های بلوتوث \"همیشه قابل شناسایی\" کند. می خواهید این کار را انجام دهید؟"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"برنامه ای در رایانه لوحی شما درخواست مجوز برای روشن کردن بلوتوث کرده و اینکه دستگاه شما برای دیگر دستگاه ها به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل شناسایی باشد. می خواهید این کار را انجام دهید؟"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"برنامه ای در گوشی شما درخواست مجوز برای روشن کردن بلوتوث کرده و اینکه دستگاه شما برای دیگر دستگاه ها به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل شناسایی باشد. می خواهید این کار را انجام دهید؟"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"یک برنامه کاربردی در رایانه لوحی شما درخواست اجازه کرده است که بلوتوث را روشن کرده و رایانه لوحی شما را برای سایر دستگاه ها قابل شناسایی کند. می خواهید این کار را انجام دهید؟"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"یک برنامه کاربردی در تلفن شما درخواست اجازه کرده است که بلوتوث را روشن کرده و تلفن شما را برای سایر دستگاه ها قابل شناسایی کند. می خواهید این کار را انجام دهید؟"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"خاموش کردن بلوتوث..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"اتصال خودکار"</string>
     <string name="date_and_time" msgid="4114084177056654663">"تنظیمات تاریخ و ساعت"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"تنظیمات پروکسی"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"تنظیم پروکسی HTTP جهانی و لیست های استثنا"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"پاک کردن"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"درگاه"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"درگاه"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"فاقد پروکسی برای"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"بازیابی موارد پیش فرض"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"انجام شد"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"نام میزبان"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"نام میزبان"</string>
     <string name="proxy_error" msgid="8926675299638611451">"توجه"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"تأیید"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"نام میزبانی که وارد کرده اید معتبر نیست."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"باید قسمت درگاه را پر کنید."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"اگر قسمت میزبان خالی است، قسمت درگاه باید خالی باشد."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"درگاهی که نوشته اید معتبر نیست."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"مکان:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID مجاور:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"تلاش های داده:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"برای باز کردن قفل صفحه یک پین عددی لازم است"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"رمز ورود"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"برای باز کردن قفل صفحه یک رمز ورود لازم است"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"از طریق سرپرست دستگاه راه دور غیرفعال شد"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"از طریق سرپرست دستگاه راه دور غیرفعال شد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"خاموش"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"ناامن"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"ایمن شده با الگو"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"پین باید حداقل %d نویسه باشد"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"پس از انجام کار، ادامه را لمس کنید"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ادامه"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"پین نباید بیشتر از %d رقم باشد"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"پین نباید بیشتر از %d رقم باشد"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"پین باید دارای 0 تا 9 رقم باشد"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"سرپرست دستگاه اجازه استفاده از پین اخیر را نمی دهد"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"رمز ورود دارای یک نویسه غیرقانونی است"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP یا CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"نوع APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"حذف APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN جدید"</string>
     <string name="menu_save" msgid="8109345640668285399">"ذخیره"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"اتصال چند دقیقه طول می کشد..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"برای ادامه تنظیم، "<b>"بعدی"</b>" را لمس کنید."\n\n" برای اتصال به یک شبکه Wi-Fi دیگر، "<b>"برگشت"</b>" را لمس کنید."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"همگام سازی تنظیمات"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"همگام سازی در حال حاضر دارای مشکلی است. در مدت کوتاهی تصحیح می شود."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"افزودن حساب"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"تنظیمات همگام سازی کلی"</string>
     <string name="background_data" msgid="5779592891375473817">"داده های پس زمینه"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"برنامه ها در هر زمان می توانند داده ها را همگام کرده، ارسال و دریافت کنند"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"توجه"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"غیرفعال کردن داده های پس زمینه طول عمر باتری را بیشتر کرده و مصرف داده ها را کاهش می دهد. برخی از برنامه ها ممکن است همچنان از اتصال داده در پس زمینه استفاده کنند."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"همگام سازی خودکار"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"همگام سازی خودکار داده ها توسط برنامه ها"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"مدیریت حساب ها"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"همگام سازی روشن است"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"خطای همگام سازی"</string>
     <string name="settings_backup" msgid="2274732978260797031">"تهیه پشتیبان از تنظیمات"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"تهیه نسخه پشتیبان از تنظیمات من"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"همگام سازی اکنون"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"لغو همگام سازی"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"لمس کنید تا اکنون همگام سازی شود<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"تقویم"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"مخاطبین"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"به همگام ساز Google خوش آمدید!"</font>" "\n"این رویکردی از Google است برای همگام سازی داده ها و ایجاد امکان دسترسی به مخاطبین، قرارها و موارد بیشتر از هر کجا که هستید."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"تنظیمات همگام سازی برنامه کاربردی"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"داده و همگام سازی"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 44712dc..fcbdeb0 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minuuttia"</item>
+    <item msgid="5780349442819375570">"5 minuuttia"</item>
+    <item msgid="1166466894270177580">"1 tunti"</item>
+    <item msgid="9032073376232198148">"Ei koskaan"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Huono"</item>
     <item msgid="5615082285463430971">"Kohtalainen"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ei mitään"</item>
-    <item msgid="6267482274276126058">"Staattinen"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Staattinen"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Pois käytöstä"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP tai CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Laitteen sisäinen tallennustila"</item>
     <item msgid="3738430123799803530">"Poistettava SD-kortti"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 38c1c8c..6011186 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Tunnistettavissa"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Tunnistettavissa <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunnin ajan..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Tunnistettavissa"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Aseta laite tunnistettavaksi"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Aika, jolloin laite tunnistettavissa"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Määritä, kuinka kauan laite on tunnistettavissa"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lukitse äänipuhelut"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Estä Bluetooth-puhelut kun näyttö on lukittu"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-laitteet"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Sovellus pyytää lupaa ottaa Bluetooth-yhteys käyttöön. Haluatko myöntää luvan?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Tablet-laitteesi sovellus pyytää lupaa asettaa tablet-laitteen muiden Bluetooth-laitteiden löydettäviin <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Puhelimesi sovellus pyytää lupaa asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Tablet-laitteesi sovellus pyytää lupaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Puhelimesi sovellus pyytää lupaa asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Tablet-laitteesi sovellus pyytää lupaa ottaa Bluetooth-yhteys käyttöön ja asettaa tablet-laite muiden Bluetooth-laitteiden löydettäviin <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Puhelimesi sovellus pyytää lupaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Tablet-laitteesi sovellus pyytää lupaa ottaa Bluetooth-yhteys käyttöön ja asettaa tablet-laite muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Puhelimesi sovellus pyytää lupaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Otetaan Bluetooth-yhteys käyttöön…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Yhdistä automaattisesti"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Päivämäärä- ja aika-asetukset"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Välityspalvelimen asetukset"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Aseta yleinen HTTP-välityspalvelin ja poissulkemisluettelot"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tyhjennä"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Portti"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Portti"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Ei välityspalvelinta kohteille:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Palauta oletukset"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Valmis"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Palvelimen nimi"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Palvelimen nimi"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Huomio"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Antamasi palvelimen nimi on virheellinen."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Täytä porttikenttä."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portti-kentän täytyy olla tyhjä, jos isäntä-kenttä on tyhjä."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Antamasi portti on virheellinen."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Sijainti:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naapuri-CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tiedonsiirtoyrityksiä:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Vaadi PIN-koodi ruudun avaamiseen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Salasana"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Vaadi salasana ruudun avaamiseen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Laitteen etäylläpitäjä poisti toiminnon käytöstä"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Laitteen etäylläpitäjä poisti toiminnon käytöstä"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Ei käytössä"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Suojaamaton"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Suojattu kuviolla"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koodin täytyy olla vähintään %d merkin pituinen"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Kosketa Jatka kun olet valmis"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jatka"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN-koodi voi olla korkeintaan %d numeroa pitkä"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koodi voi olla korkeintaan %d numeroa pitkä"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-koodi saa sisältää vain numeroita 0–9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Ylläpitäjä ei salli viimeaik. PIN-koodin käyttöä"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Salasana sisältää luvattoman merkin"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP tai CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-tyyppi"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Poista APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Uusi APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Tallenna"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 06a9075..fdf6f4d 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minutes"</item>
+    <item msgid="5780349442819375570">"5 minutes"</item>
+    <item msgid="1166466894270177580">"1 heure"</item>
+    <item msgid="9032073376232198148">"Jamais"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Médiocre"</item>
     <item msgid="5615082285463430971">"Satisfaisante"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Aucun"</item>
-    <item msgid="6267482274276126058">"Statique"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statique"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Désactivé"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ou CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Mémoire interne du mobile"</item>
     <item msgid="3738430123799803530">"Carte SD amovible"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0e7124d..dad39d6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Identifiable"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Identifiable pendant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondes..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Identifiable"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Permettre l\'identification de l\'appareil"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Délai au-delà duquel l\'appareil n\'est plus identifiable"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Définir la durée pendant laquelle l\'appareil est identifiable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquer les appels par reconnaissance vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via le Bluetooth lorsque l\'écran est verrouillé"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Appareils Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Une application demande l\'autorisation d\'activer Bluetooth. Voulez-vous l\'activer ?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Une application installée sur votre tablette demande l\'autorisation de rendre cette dernière détectable par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous activer cette fonction ?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Une application sur votre téléphone demande l\'autorisation d\'activer la fonction de détection de votre téléphone par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous l\'activer ?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Une application de votre tablette demande l\'autorisation de rendre cette dernière identifiable en permanence par d\'autres appareils Bluetooth. Voulez-vous activer cette fonction ?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Une application de votre téléphone demande l\'autorisation de rendre ce dernier identifiable en permanence par d\'autres appareils Bluetooth. Voulez-vous activer cette fonction ?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Une application de votre tablette demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils de détecter la tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous activer cette fonction ?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Une application sur votre téléphone demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils de détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous l\'activer ?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Une application de votre tablette demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils d\'identifier votre tablette. Voulez-vous activer cette fonction ?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Une application de votre téléphone demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils d\'identifier votre téléphone. Voulez-vous activer cette fonction ?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activation du Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Connexion automatique"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Paramètres d\'heure et de date"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Paramètres proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Définir le proxy HTTP global et les listes d\'exclusion"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Effacer"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Aucun proxy pour"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Rétablir les paramètres par défaut"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"OK"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nom de l\'hôte"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nom de l\'hôte"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Avertissement"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Le nom d\'hôte saisi n\'est pas valide."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Vous devez renseigner le champ Port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Le port indiqué n\'est pas valide."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Exiger PIN numérique pour déverrouiller écran"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Exiger mot de passe pour déverrouiller écran"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Désactivé par un administrateur distant"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Désactivé par un administrateur distant"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Désactiver"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Désécuriser"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sécurisé par un schéma"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Le code PIN doit comporter au moins %d caractères."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Appuyez sur Continuer une fois l\'opération terminée."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Le code PIN ne doit pas contenir plus de %d chiffres."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Le code PIN ne doit pas contenir plus de %d chiffres."</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Le code PIN ne doit contenir que des chiffres compris entre 0 et 9."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Code PIN récent refusé par admin. périphérique"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Le mot de passe contient un caractère non autorisé."</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ou CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Type d\'APN (nom du point d\'accès)"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Supprimer l\'APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nouvel APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Enregistrer"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 2fbbdb4..c84e0cc 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minute"</item>
+    <item msgid="5780349442819375570">"5 minuta"</item>
+    <item msgid="1166466894270177580">"1 h"</item>
+    <item msgid="9032073376232198148">"Nikada"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Loše"</item>
     <item msgid="5615082285463430971">"Solidan"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ništa"</item>
-    <item msgid="6267482274276126058">"Statično"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statično"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Isključeno"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ili CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interno pohranjivanje na uređaj"</item>
     <item msgid="3738430123799803530">"Prijenosna SD kartica"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f619a48..f6a9bfb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Moguće prepoznavanje"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Moguće prepoznavanje za <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Moguće prepoznavanje"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Omogući prepoznavanje uređaja"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Privremeni prekid mogućeg prepoznavanja"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Odredite koliko će dugo biti moguće otkriti uređaj"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zaključaj biranje glasom"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Spriječite upotrebu Bluetooth birača ako je zaslon zaključan"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth uređaji"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikacija traži dozvolu za uključenje Bluetootha. Želite li to učiniti?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikacija na tabletnom uređaju traži dozvolu da tabletni uređaj učini vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunda. Želite li to učiniti?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikacija na vašem telefonu traži dopuštenje da vaš telefon učini vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite li to dopustiti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikacija na tablet računalu traži dopuštenje da ga drugi Bluetooth uređaji mogu uvijek prepoznati. Želite li to dopustiti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikacija na vašem telefonu traži dopuštenje da uvijek omogući prepoznavanje vašeg telefona drugim Bluetooth uređajima. Želite li to dopustiti?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikacija na tabletnom uređaju traži dozvolu da uključi Bluetooth i da tabletni uređaj učini vidljivim drugim uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunda. Želite li to učiniti?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikacija na vašem telefonu traži dopuštenje za uključivanje značajke Bluetooth i da vaš telefon učini vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite li to dopustiti?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikacija na tablet računalu traži dopuštenje da uključi Bluetooth i omogući drugim uređajima prepoznavanje tablet računala. Želite li to dopustiti?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikacija na vašem telefonu traži dopuštenje da uključi Bluetooth i vaš telefon učini vidljivim drugim Bluetooth uređajima. Želite li to dopustiti?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Uključivanje Bluetootha…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatsko povezivanje"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Postavke datuma i vremena"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy postavke"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Postavi globalni HTTP proxy i popise za isključivanje"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Očisti"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nema proxy postavki za"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Vrati zadano"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Gotovo"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Naziv hosta"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Naziv hosta"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pažnja"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"U redu"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Naziv hosta nije valjan."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Morate dovršiti polje priključka."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Polje priključka mora biti prazno ako je i polje hosta prazno."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Upisani priključak nije valjan."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedski CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokušaji za podatke:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Zahtijeva numerički PIN za otključavanje zaslona"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Zaporka"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Potrebna je zaporka za otključavanje zaslona"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Onemogućio administrator udaljenog uređaja"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Onemogućio administrator udaljenog uređaja"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Isključeno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Nesigurno"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Osigurano uzorkom"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mora imati najmanje ovoliko znakova %d"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Dodirnite Nastavak kad završite"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN ne može imati više od ovoliko znamenaka: %d"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN ne može imati više od ovoliko znamenaka: %d"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN mora sadržavati samo znamenke 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Admin. uređaja onemogućuje upotrebu zadnjeg PIN-a"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Zaporka sadrži nedopušteni znak"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ili CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Vrsta APN-a"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Izbriši APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novi APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Spremi"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Povezivanje može potrajati nekoliko minuta..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja."\n\n"Dodirnite "<b>"Natrag"</b>" za povezivanje s drugom Wi-Fi mrežom."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Sink. postavke"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Sinkronizacija trenutačno ima problema. Uskoro će nastaviti s radom."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Dodavanje računa"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Postavke opće sinkronizacije"</string>
     <string name="background_data" msgid="5779592891375473817">"Pozadinski podaci"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Aplikacije mogu sink., slati i primati podatke bilo kada"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Pažnja"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Onemogućavanje pozadinskih podataka produljuje trajanje baterije i smanjuje upotrebu podataka. Neke aplikacije još uvijek mogu upotrebljavati pozadinsku podatkovnu mrežu."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automatska sinkronizacija"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikacije podatke sinkroniziraju automatski"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Upravljaj računima"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sink. uključena"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Pogreška sink."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Postavke sigurnosne kopije"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Stvori sigurnosnu kopiju postavki"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkroniziraj sada"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Otkaži sinkronizaciju"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Dodirnite da biste odmah sinkronizirali<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendar"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontakti"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Dobro došli u Google sinkronizaciju!"</font>" "\n"Googleov pristup sinkronizaciji podataka za mogućnost pristupa kontaktima, sastancima i drugim stavkama s bilo kojeg mjesta."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Postavke sinkronizacije aplikacije"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podaci i sinkronizacija"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 7fe6e93..d6e2a5e 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 perc"</item>
+    <item msgid="5780349442819375570">"5 perc"</item>
+    <item msgid="1166466894270177580">"1 óra"</item>
+    <item msgid="9032073376232198148">"Soha"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Gyenge"</item>
     <item msgid="5615082285463430971">"Közepes"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nincs"</item>
-    <item msgid="6267482274276126058">"Statikus"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statikus"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Ki"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP vagy CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Belső tárhely"</item>
     <item msgid="3738430123799803530">"Eltávolítható SD-kártya"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5744dfa..801af2d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Felderíthető"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> másodpercig felderíthető..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Felderíthető"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Az eszköz legyen felderíthető"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Felfedezhetőségi időtartam"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Állítsa be, milyen hosszan legyen felfedezhető az eszköz"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Hanghívás zárolása"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"A bluetooth tárcsázó használatának megakadályozása, ha a képernyő le van zárva"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth eszközök"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Egy alkalmazás engedélyt kér a Bluetooth bekapcsolására. Megadja az engedélyt?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Egy alkalmazás engedélyt kér arra, hogy táblagépét <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felfedezhetővé tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Az egyik alkalmazás engedélyt kér arra, hogy <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felderíthetővé tegye telefonját más Bluetooth eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Egy alkalmazás engedélyt kér arra, hogy táblagépét \"mindig felfedezhetővé\" tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Egy alkalmazás engedélyt kér arra, hogy telefonját \"mindig felfedezhetővé\" tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Egy alkalmazás engedélyt kér arra, hogy táblagépét <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felfedezhetővé tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Az egyik alkalmazás engedélyt kér arra, hogy <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felderíthetővé tegye telefonját más eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Egy alkalmazás engedélyt kér arra, hogy bekapcsolja a Bluetooth-t, és táblagépét felfedezhetővé tegye más eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Egy alkalmazás engedélyt kér arra, hogy bekapcsolja a Bluetooth-t, és telefonját felfedezhetővé tegye más eszközök számára. Engedélyezi ezt?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"A Bluetooth bekapcsolása..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatikus csatlakozás"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Dátum és idő beállításai"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxybeállítások"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"A globális HTTP proxy- és kivétellisták beállítása"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Törlés"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nincs proxy a következőkhöz"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Alapértelmezés visszaállítása"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Kész"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Gazdagépnév"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Gazdagépnév"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Figyelem"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"A megadott gazdagépnév nem érvényes."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Ki kell töltenie a port mezőt."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"A port mezőnek is üresnek kell maradnia, ha a gazdagép mező üres."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"A megadott port nem érvényes."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Hely:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Környező CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Adatkísérletek:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Numerikus PIN kell a képernyő feloldásához"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Jelszó"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Jelszó kell a képernyő feloldásához"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"A távoli eszköz rendszergazdája kikapcsolta"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"A távoli eszköz rendszergazdája kikapcsolta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Ki"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Nem biztosított"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Mintával biztosítva"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"A PIN-kódnak legalább %d karakter hosszúnak kell lennie"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Ha kész, érintse meg a Folytatás gombot"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Folytatás"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"A PIN-kód nem lehet hosszabb %d számjegynél"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"A PIN-kód nem lehet hosszabb %d számjegynél"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"A PIN-kód csak számokat tartalmazhat, 0-tól 9-ig"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Az eszköz-rendszergazda nem engedélyezi nemrég használt PIN kód használatát"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"A jelszóban van egy nem használható karakter"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP vagy CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN típusa"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN törlése"</string>
     <string name="menu_new" msgid="3014205883303921729">"Új APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Mentés"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index de07792..d17afc5 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 menit"</item>
+    <item msgid="5780349442819375570">"5 menit"</item>
+    <item msgid="1166466894270177580">"1 Jam"</item>
+    <item msgid="9032073376232198148">"Jangan pernah"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Buruk"</item>
     <item msgid="5615082285463430971">"Sedang"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Tak Satu Pun"</item>
-    <item msgid="6267482274276126058">"Statik"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statik"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Mati"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP atau CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Penyimpanan perangkat internal"</item>
     <item msgid="3738430123799803530">"Kartu SD yang dapat dicopot"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0049aa1..d71d095 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Dapat ditemukan"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Dapat ditemukan selama <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> detik……"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Dapat ditemukan"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Buat perangkat dapat ditemukan"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Waktu dapat ditemukan habis"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setel berapa lama perangkat dapat ditemukan"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci pemanggilan suara"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Mencegah penggunaan aplikasi telepon Bluetooth ketika layar terkunci"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Perangkat bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikasi meminta izin untuk menghidupkan Bluetooth. Anda ingin melakukan ini?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikasi di tablet Anda meminta izin untuk membuat tablet Anda dapat ditemukan oleh perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Anda ingin melakukan ini?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikasi pada ponsel Anda meminta izin untuk membuat ponsel Anda dapat ditemukan oleh perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Apakah Anda ingin melakukannya?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikasi di tablet Anda meminta izin untuk membuat tablet \"selalu dapat ditemukan\" oleh perangkat Bluetooth lain. Anda ingin melakukannya?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikasi pada ponsel Anda meminta izin untuk membuat ponsel \"selalu dapat ditemukan\" oleh perangkat Bluetooth lain. Anda ingin melakukannya?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikasi di tablet Anda meminta izin untuk mengaktifkan Bluetooth dan membuat tablet Anda dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Anda ingin melakukan ini?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikasi pada ponsel Anda meminta izin untuk mengaktifkan Bluetooth dan untuk membuat ponsel Anda dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Apakah Anda ingin melakukannya?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikasi pada tablet Anda meminta izin untuk mengaktifkan Bluetooth dan membuat tablet dapat ditemukan oleh perangkat lain. Anda ingin melakukannya?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikasi pada ponsel Anda meminta izin untuk mengaktifkan Bluetooth dan membuat ponsel dapat ditemukan oleh perangkat lain. Anda ingin melakukannya?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Menghidupkan Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Sambung otomatis"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setelan tanggal &amp; waktu"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Setelan proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Setel proxy HTTP global dan daftar pengecualian"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Bersihkan"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Tidak ada Proxy untuk"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Pulihkan bawaan"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Selesai"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nama inang"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nama inang"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Perhatian"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Nama inang yang Anda ketikkan tidak valid."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Anda harus melengkapi bidang port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Bidang port harus kosong jika bidang inang kosong."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Port yang Anda ketikkan tidak valid."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID bersebelahan:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Upaya data:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Perlu PIN numerik untuk membuka kunci layar"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Sandi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Membutuhkan sandi untuk membuka kunci layar"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Dinonaktifkan oleh administrator perangkat jarak jauh"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Dinonaktifkan oleh administrator perangkat jarak jauh"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Mati"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Tidak diamankan"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Diamankan dengan pola"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN minimal terdiri dari %d karakter"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Sentuh Lanjutkan setelah selesai"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Lanjutkan"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN tidak boleh lebih panjang daripada %d digit"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN tidak boleh lebih panjang daripada %d digit"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN hanya boleh memuat angka 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Administrator perangkat tidak membolehkan penggunaan PIN terbaru"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Sandi mengandung karakter yang tidak sah"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP atau CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Jenis APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Hapus APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN baru"</string>
     <string name="menu_save" msgid="8109345640668285399">"Simpan"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Menyambungkan membutuhkan waktu beberapa menit..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan. "\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung dengan jaringan Wi-Fi yang berbeda."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Setelan sinkronisasi"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Saat ini sinkronisasi mengalami masalah. Sinkronisasi akan segera kembali."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Tambahkan akun"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Setelan sinkronisasi umum"</string>
     <string name="background_data" msgid="5779592891375473817">"Data latar belakang"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Aplikasi dapat menyinkronkan, mengirimkan, dan menerima data kapan pun"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Perhatian"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Menonaktifkan data latar belakang memperpanjang masa pakai baterai dan menurunkan penggunaan data. Beberapa aplikasi masih dapat menggunakan sambungan data latar belakang."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Sinkronisasi otomatis"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikasi menyinkronkan data secara otomatis"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Mengelola akun"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinkronisasi AKTIF"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Galat sinkronisasi"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Setelan cadangan"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Cadangkan setelan saya"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkronisasi sekarang"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Batalkan sinkronisasi"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Sentuh untuk menyinkronkan sekarang<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kenalan"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>\n" Pendekatan Google untuk menyinkronkan data guna membolehkan akses ke kenalan, janji temu, dan lain-lain dari mana saja."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Setelan sinkronisasi aplikasi"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; sinkronisasi"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 4ccfa8b..83e95c0 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minuti"</item>
+    <item msgid="5780349442819375570">"5 minuti"</item>
+    <item msgid="1166466894270177580">"1 ora"</item>
+    <item msgid="9032073376232198148">"Mai"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Scadente"</item>
     <item msgid="5615082285463430971">"Discreta"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nessuno"</item>
-    <item msgid="6267482274276126058">"Statico"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statico"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Disattiva"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Memorizzazione su dispositivo interno"</item>
     <item msgid="3738430123799803530">"Scheda SD rimovibile"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 55fe375..f5d51c0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Rilevabile"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Rilevabile per <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondi..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Rilevabile"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Rendi rilevabile il dispositivo"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Timeout rilevabilità"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Imposta la durata della rilevabilità del dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocca composizione vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedisci l\'uso del compositore Bluetooth quando lo schermo è bloccato"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivi Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Un\'applicazione chiede l\'autorizzazione per attivare Bluetooth. Procedere?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per rendere il tuo tablet rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per rendere il tuo telefono rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per rendere il tuo tablet \"sempre rilevabile\" da altri dispositivi Bluetooth. Procedere?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per rendere il tuo telefono \"sempre rilevabile\" da altri dispositivi Bluetooth. Procedere?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo tablet rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo telefono rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo tablet rilevabile da altri dispositivi. Procedere?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo telefono rilevabile da altri dispositivi. Procedere?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Attivazione Bluetooth in corso…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Connessione automatica"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Impostazioni data e ora"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Impostazioni proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Imposta il proxy HTTP globale e gli elenchi di esclusioni"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Cancella"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Porta"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nessun proxy per"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ripristina predefinite"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Fine"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome host"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nome host"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Attenzione"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Il nome host specificato non è valido."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Inserisci un valore nel campo Porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Il campo Porta deve essere vuoto se il campo Host è vuoto."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"La porta specificata non è valida."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posizione:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID adiacente:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativi dati:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Richiedi PIN numerico per sbloccare lo schermo"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Richiedi password per sbloccare lo schermo"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Disabilitata da ammin dispositivo remoto"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Disabilitata da ammin dispositivo remoto"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Off"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Non protetto"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protetto con sequenza"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN deve essere lungo almeno %d caratteri"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Al termine, tocca Continua"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Il PIN non può superare %d cifre"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Il PIN non può superare %d cifre"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Il PIN deve contenere solo cifre da 0 a 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"L\'amministratore del dispositivo non consente l\'utilizzo di un PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La password contiene un carattere non valido"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Elimina APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nuovo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salva"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 7990130..d0dc1db 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 דקות"</item>
+    <item msgid="5780349442819375570">"5 דקות"</item>
+    <item msgid="1166466894270177580">"שעה אחת"</item>
+    <item msgid="9032073376232198148">"לעולם לא"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"נמוכה"</item>
     <item msgid="5615082285463430971">"סביר"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"ללא"</item>
-    <item msgid="6267482274276126058">"סטטי"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"סטטי"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"כבוי"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP או CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"אחסון פנימי במכשיר"</item>
     <item msgid="3738430123799803530">"כרטיס SD נשלף"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4fea186..88d2bd1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"בר-גילוי"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"גלוי למשך <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> שניות…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"גלוי"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"הפוך את ההתקן לבר-גילוי"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"זמן קצוב לתפוגה של מצב גלוי"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"הגדר במשך כמה זמן ההתקן יהיה גלוי"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"נעל חיוג קולי"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"מנע את השימוש בחייגן Bluetooth כאשר הצג נעול"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"התקני Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"יישום מבקש הרשאה להפעיל Bluetooth. האם ברצונך לעשות זאת?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"יישום בהטבלט מבקש הרשאה להפוך את הטבלט לגלוי להתקני Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לבצע זאת?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"יישום בטלפון מבקש הרשאה להפוך את הטלפון לגלוי להתקני Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לעשות זאת?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"יישום בטבלט מבקש הרשאה להפוך את הטבלט ל\"גלוי תמיד\" להתקני Bluetooth אחרים. האם ברצונך לבצע זאת?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"יישום בטלפון מבקש הרשאה להפוך את הטלפון ל\"גלוי תמיד\" להתקני Bluetooth אחרים. האם ברצונך לעשות זאת?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"יישום בטבלט מבקש הרשאה להפעיל Bluetooth ולהפוך את הטבלט לגלוי אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לבצע זאת?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"יישום בטלפון מבקש הרשאה להפעיל Bluetooth ולהפוך את הטלפון לגלוי להתקנים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לבצע פעולות אלה?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"יישום בטבלט מבקש הרשאה להפעיל Bluetooth ולהפוך את הטבלט לגלוי להתקנים אחרים. האם ברצונך לבצע זאת?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"יישום בטלפון מבקש הרשאה להפעיל Bluetooth ולהפוך את הטלפון לגלוי להתקנים אחרים. האם ברצונך לבצע זאת?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"מפעיל Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"חיבור אוטומטי"</string>
     <string name="date_and_time" msgid="4114084177056654663">"הגדרות תאריך ושעה"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"הגדרות שרת proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"הגדר את שרת proxy הגלובלי של HTTP ורשימות אי הכללה"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"נקה"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"יציאה"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"יציאה"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"ללא שרת proxy"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"שחזר ברירות מחדל"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"בוצע"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"שם מארח"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"שם מארח"</string>
     <string name="proxy_error" msgid="8926675299638611451">"לידיעתך"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"אישור"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"שם המארח שהקלדת אינו חוקי."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"עליך למלא את שדה היציאה."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"שדה היציאה חייב להיות ריק אם שדה המארח ריק."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"היציאה שהקלדת אינה חוקית."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"מיקום:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID שכן:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ניסיונות נתונים:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"דרוש PIN מספרי לביטול נעילת המסך"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"סיסמה"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"דרושה סיסמה לביטול נעילת המסך"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"הושבת על ידי מנהל מערכת מרוחק של התקן"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"הושבת על ידי מנהל מערכת מרוחק של התקן"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"כבוי"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"לא מאובטח"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"מאובטח עם קו"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"אורכו של ה-PIN חייב להיות %d תווים לפחות"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"גע ב\'המשך\' כשתסיים"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"המשך"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"אורכו של ה-PIN לא יעלה על %d ספרות"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"אורכו של ה-PIN לא יעלה על %d ספרות"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"ה-PIN חייב להכיל רק את הספרות 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"מנהל ההתקן אינו מאפשר שימוש ב-PIN שהיה בשימוש לאחרונה"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"הסיסמה מכילה תו לא חוקי"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP או CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"סוג APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"מחק APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN חדש"</string>
     <string name="menu_save" msgid="8109345640668285399">"שמור"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index d25a60b..2da4b6e 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2分"</item>
+    <item msgid="5780349442819375570">"5分"</item>
+    <item msgid="1166466894270177580">"1時間"</item>
+    <item msgid="9032073376232198148">"なし"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"弱"</item>
     <item msgid="5615082285463430971">"中"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"なし"</item>
-    <item msgid="6267482274276126058">"静的"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"静的"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"OFF"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAPまたはCHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"内部端末ストレージ"</item>
     <item msgid="3738430123799803530">"リムーバブルSDカード"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2135ee8..cca4c39 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"検出可能"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>秒間検出可能..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"検出可能"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"この端末の検出を許可する"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"検出可能時間のタイムアウト"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"端末の検出可能時間を設定する"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ボイスダイヤルをロック"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"画面がロックされているときはBluetoothボイスダイヤルを使用しない"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth端末"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"アプリケーションがBluetoothをONにする許可をリクエストしています。許可しますか?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"アプリケーションが、このタブレットを<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"アプリケーションが、この端末を<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetooth端末から検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"アプリケーションが、このタブレットを他のBluetoothデバイスから「常に検出できるようにする」許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"アプリケーションが、この端末を他のBluetoothデバイスから「常に検出できるようにする」許可をリクエストしています。許可しますか?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"アプリケーションが、BluetoothをONにしてこのタブレットを<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"アプリケーションが、BluetoothをONにしてこの端末を<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他の端末から検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"アプリケーションが、BluetoothをONにしてこのタブレットを他のデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"アプリケーションが、BluetoothをONにしてこの端末を他のデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"BluetoothをONにしています..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"自動接続"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日付と時刻"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"プロキシ設定"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"グローバルHTTPプロキシと除外リストを設定する"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"消去"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"ポート"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"ポート"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"プロキシ不使用"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"初期設定に戻す"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"終了"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"ホスト名"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"ホスト名"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"入力したホスト名は無効です。"</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"[ポート]フィールドに入力してください。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"[ホスト]フィールドが空の場合は、[ポート]フィールドも空にしてください。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"入力したポートは無効です。"</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ロケーション:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"近くのCID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"データの試行:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"画面ロックを数値PINで解除する"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"パスワード"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"画面ロックをパスワードで解除する"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"リモートの端末管理者が無効にしました"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"リモートの端末管理者が無効にしました"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"OFF"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"保護されていません"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"パターンで保護されています"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PINを%d文字以上で入力してください"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"終了後[次へ]をタップ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"次へ"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PINは%d桁以内で指定してください"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PINは%d桁以内で指定してください"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PINに使用できるのは数字0~9のみです"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"最近使用されたPINは使用できません"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"パスワードに無効な文字が含まれています"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAPまたはCHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APNタイプ"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APNを削除"</string>
     <string name="menu_new" msgid="3014205883303921729">"新しいAPN"</string>
     <string name="menu_save" msgid="8109345640668285399">"保存"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 779b086..0020508 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2분"</item>
+    <item msgid="5780349442819375570">"5분"</item>
+    <item msgid="1166466894270177580">"1시간"</item>
+    <item msgid="9032073376232198148">"선택 안함"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"나쁨"</item>
     <item msgid="5615082285463430971">"양호함"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"없음"</item>
-    <item msgid="6267482274276126058">"고정"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"고정"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"사용 안함"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP 또는 CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"내부 기기 저장용량"</item>
     <item msgid="3738430123799803530">"이동식 SD 카드"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8669e68..5068f18 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"검색 가능"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>초 동안 검색 가능..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"검색 가능"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"장치를 검색 가능하게 설정"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"검색 가능 시간제한"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"검색 가능 기간 설정"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"잠금 시 음성 다이얼링"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"화면 잠금 시 블루투스 다이얼러 사용 방지"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth 장치"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"애플리케이션에서 블루투스 사용 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"태블릿의 애플리케이션이 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 장치에서 사용자의 태블릿을 찾을 수 있는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"휴대전화의 애플리케이션에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 장치에서 사용자의 휴대전화를 찾을 수 있는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"태블릿의 애플리케이션이 다른 블루투스 기기에서 사용자의 태블릿을 \'항상 검색할 수 있도록 하는\' 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"휴대전화의 애플리케이션이 다른 블루투스 기기에서 사용자의 휴대전화를 \'항상 검색\'할 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"태블릿의 애플리케이션이 블루투스 사용 및 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 장치에서 사용자의 태블릿을 찾을 수 있는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"휴대전화의 애플리케이션에서 블루투스 사용 및 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 장치에서 사용자의 휴대전화를 찾을 수 있는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"태블릿의 애플리케이션이 블루투스를 사용할 권한 및 다른 기기에서 사용자의 태블릿을 찾을 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"휴대전화의 애플리케이션이 블루투스를 사용할 권한 및 다른 기기에서 사용자의 휴대전화를 검색할 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"블루투스 켜는 중..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"자동 연결"</string>
     <string name="date_and_time" msgid="4114084177056654663">"날짜 및 시간 설정"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"프록시 설정"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"전체 HTTP 프록시 및 제외목록 설정"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"지우기"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"포트"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"포트"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"프록시 없음"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"기본값 복원"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"완료"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"호스트 이름"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"호스트 이름"</string>
     <string name="proxy_error" msgid="8926675299638611451">"주의"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"확인"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"입력한 호스트 이름이 잘못되었습니다."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"포트 필드를 입력해야 합니다."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"호스트 필드가 비어 있는 경우 포트 필드에 입력하면 안 됩니다."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"입력한 포트가 올바르지 않습니다."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"위치:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"인접한 CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"데이터 시도:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"화면 잠금을 해제하려면 숫자 PIN이 필요합니다."</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"비밀번호"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"화면 잠금을 해제하려면 비밀번호가 필요합니다."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"원격 기기 관리자가 사용 중지함"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"원격 기기 관리자가 사용 중지함"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"사용 안함"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"화면 잠금 안함"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"패턴으로 보안"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN은 %d자 이상이어야 합니다."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"완료되면 계속을 터치하세요."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"계속"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN은 %d자리 이하여야 합니다."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN은 %d자리 이하여야 합니다."</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN에는 숫자 0-9만 사용할 수 있습니다."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"장치 관리자가 최근 PIN 사용을 허용하지 않습니다."</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"비밀번호에 잘못된 글자가 들어 있습니다."</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP 또는 CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN 유형"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN 삭제"</string>
     <string name="menu_new" msgid="3014205883303921729">"새 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"저장"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index d390f56..9690679 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minutės"</item>
+    <item msgid="5780349442819375570">"5 minutės"</item>
+    <item msgid="1166466894270177580">"1 valanda"</item>
+    <item msgid="9032073376232198148">"Niekada"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Prastas"</item>
     <item msgid="5615082285463430971">"Neblogas"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nėra"</item>
-    <item msgid="6267482274276126058">"Statinis"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statinis"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Išjungta"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP arba CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Vidinė įrenginio saugykla"</item>
     <item msgid="3738430123799803530">"Keičiama SD kortelė"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ccea113..1f8d159 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Randamas"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Randamas <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sek..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Randamas"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padaryti įrenginį atrandamą"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Aptinkamumo skirtasis laikas"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nustatyti, kiek laiko įrenginys bus aptinkamas"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Užrakinti numerio rinkimą balsu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neleisti naudoti „Bluetooth“ numerio rinkiklio, kai ekranas užrakintas"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"„Bluetooth“ įrenginiai"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Pateikta programos užklausa dėl leidimo įjungti „Bluetooth“. Ar norite tai atlikti?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Pateikta planšetinio kompiuterio programos užklausa leisti <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. kitiems „Bluetooth“ įrenginiams surasti jūsų planšetinį kompiuterį. Ar norite tai atlikti?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Jūsų telefone esanti programa prašo leidimo padaryti telefoną randamu kitiems „Bluetooth“·įrenginiams <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Ar norite tai daryti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Planšetinio kompiuterio programa prašo leidimo jūsų planšetinį kompiuterį padaryti „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Telefono programa prašo leidimo telefoną padaryti „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Ar norite tai atlikti?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Pateikta planšetinio kompiuterio programos užklausa leisti įjungti „Bluetooth“ ir <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. kitiems įrenginiams surasti jūsų planšetinį kompiuterį. Ar norite tai atlikti?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Telefone esanti programa prašo leidimo įjungti „Bluetooth“ ir padaryti telefoną randamą kitų įrenginių·<xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Planšetinio kompiuterio programa prašo leidimo įjungti „Bluetooth“ ir planšetinį kompiuterį padaryti aptinkamą kitų „Bluetooth“ įrenginių. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Telefone esanti programa prašo leidimo įjungti „Bluetooth“ ir padaryti telefoną aptinkamą kitų įrenginių. Ar norite tai atlikti?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Įjungiamas „Bluetooth“..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatinis prijungimas"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datos ir laiko nustatymai"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Tarpinio serverio nustatymai"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Nustatyti bendrąjį HTTP tarpinį serverį ir išimčių sąrašus"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Išvalyti"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Prievadas"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Prievadas"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nėra tarpinio serverio"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Atkurti numatytuosius nustatymus"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Atlikta"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Prieglobos pavadinimas"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Prieglobos pavadinimas"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Dėmesio"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Gerai"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Įvestas prieglobos pavadinimas neteisingas."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Turite užpildyti prievado lauką."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Prievado laukas turi būti tuščias, jei tuščias prieglobos laukas."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Prievadas, kurį įvedėte negalimas."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Šalia esantis CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Duomenų bandymai:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Ekranui atrakinti reikia skaitinio PIN k."</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Slaptažodis"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Ekranui atrakinti reikia slaptažodžio"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Neleidžia nuotolinio įrenginio administratorius"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Neleidžia nuotolinio įrenginio administratorius"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Išjungta"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Neapsaugoti"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Apsaugota taikant modelį"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodą turi sudaryti mažiausiai %d simboliai (-ių)"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Atlikę spustelėkite „Tęsti“"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tęsti"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN kodas negali būti ilgesnis nei %d skaitmenys (-ų)"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN kodas negali būti ilgesnis nei %d skaitmenys (-ų)"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN turi būti sudarytas tik iš skaitmenų 0–9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Įrenginio administratorius neleidžia naudoti pastarojo PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Slaptažodyje yra neleistinas simbolis"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP arba CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN tipas"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Ištrinti APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Naujas APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Išsaugoti"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Prisijungimas gali užtrukti kelias minutes..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Jei norite tęsti sąranką, palieskite "<b>"Kitas"</b>"."\n\n"Jei norite prisijungti prie kito „Wi-Fi“ tinklo, palieskite "<b>"Atgal"</b>"."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Sinchronizavimo nustatymai"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Šiuo metu iškilo sinchronizavimo problemų. Greitai jis vėl veiks."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Pridėti paskyrą"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Bendrieji sinchron. nustatymai"</string>
     <string name="background_data" msgid="5779592891375473817">"Foniniai duomenys"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Programos gali bet kada sinchron., siųsti ir gauti duomenis"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Dėmesio"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Neleidžiant foninių duomenų pailgėja akumuliatoriaus naudojimo trukmė ir sumažėja duomenų naudojimas. Kai kurios programos vis tiek gali naudoti foninių duomenų perdavimą."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automatinis sinchronizavimas"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Programų duomenys sinchronizuojami automatiškai"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Valdyti paskyras"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinchroniz. įjungtas"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Sinchronizav. klaida"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Atsarginės kopijos kūrimo nustatymai"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Kurti atsarginę nustatymų kopiją"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinchronizuoti dabar"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Atšaukti sinchronizavimą"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Palieskite, kad būtų dabar sinchronizuojama<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendorius"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktai"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Sveiki! Tai – „Google“ sinchronizavimas!"</font>" "\n"Tai „Google“ duomenų sinchronizavimo metodas, leidžiantis jums pasiekti kontaktus, susitikimus ir dar daugiau nesvarbu, kur būtumėte."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Programos sinchronizavimo nustatymai"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Duomenys ir sinchronizavimas"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index bdf351d..4a96f30 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minūtes"</item>
+    <item msgid="5780349442819375570">"5 minūtes"</item>
+    <item msgid="1166466894270177580">"1 stunda"</item>
+    <item msgid="9032073376232198148">"Nekad"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Vājš"</item>
     <item msgid="5615082285463430971">"Labs"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Neviens"</item>
-    <item msgid="6267482274276126058">"Statisks"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statisks"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Izslēgts"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP vai CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Iekšējā ierīces krātuve"</item>
     <item msgid="3738430123799803530">"Izņemama SD karte"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 814881e..a62b122 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Atklājams"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Atklājams <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekundes…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Atklājams"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padarīt ierīci atklājamu"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Taimauts procesam, kad ierīce ir atklājama"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Iestatiet laiku, cik ilgi ierīce būs atklājama."</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloķēt balss iezvani"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neļaut izmantot Bluetooth iezvanprogrammu, kad ekrāns ir bloķēts"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth ierīces"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Lietojumprogramma pieprasa atļauju ieslēgt Bluetooth. Vai vēlaties to darīt?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Lietojumprogramma jūsu planšetdatorā pieprasa atļauju padarīt planšetdatoru atrodamu ar citām Bluetooth ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Jūsu tālruņa lietojumprogramma pieprasa atļauju padarīt jūsu tālruni atklājamu citām Bluetooth ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Lietojumprogramma jūsu planšetdatorā pieprasa atļauju iestatīt planšetdatoru kā vienmēr atklājamu citām Bluetooth ierīcēm. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Lietojumprogramma jūsu tālrunī pieprasa atļauju iestatīt jūsu tālruni kā vienmēr atklājamu citām Bluetooth ierīcēm. Vai vēlaties to darīt?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Lietojumprogramma jūsu planšetdatorā pieprasa atļauju ieslēgt Bluetooth un padarīt planšetdatoru atrodamu ar citām ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Jūsu tālruņa lietojumprogramma pieprasa atļauju ieslēgt Bluetooth un padarīt jūsu tālruni atklājamu citām ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Lietojumprogramma jūsu planšetdatorā pieprasa atļauju ieslēgt Bluetooth un iestatīt planšetdatoru kā atklājamu citām ierīcēm. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Lietojumprogramma jūsu tālrunī pieprasa atļauju ieslēgt Bluetooth un iestatīt jūsu tālruni kā atklājamu citām ierīcēm. Vai vēlaties to darīt?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Notiek Bluetooth ieslēgšana…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automātiska savienošana"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datuma un laika iestatījumi"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Starpniekservera iestatījumi"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Iestatiet globālo HTTP starpniekserveri un izslēgšanas sarakstus"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Notīrīt"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Ports"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Ports"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nav starpniekservera:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Atjaunot noklusējuma iestatījumus"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Gatavs"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Saimniekdatora nosaukums"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Saimniekdatora nosaukums"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Uzmanību!"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Labi"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Jūsu ievadītais saimniekdatora nosaukums nav derīgs."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Aizpildiet porta lauku."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ja saimniekdatora lauks ir tukšs, porta laukam jābūt tukšam."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Jūsu ievadītais ports nav derīgs."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Atrašanās vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Tuvējais CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datu mēģinājumi:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Pieprasīt ciparu PIN, lai atbloķētu ekrānu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parole"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Pieprasīt paroli, lai atbloķētu ekrānu"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Atspējoja attālās ierīces administrators"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Atspējoja attālās ierīces administrators"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Izslēgts"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Nedrošs"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Aizsargāts ar kombināciju"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodā jābūt vismaz %d rakstzīmēm"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Kad ir pabeigts, pieskarieties Turpināt"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Turpināt"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN koda garums nedrīkst pārsniegt %d ciparus"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN koda garums nedrīkst pārsniegt %d ciparus"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN kodā drīkst lietot tikai ciparus 0–9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Ierīces administrators neļauj izmantot nesenu PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Parolē ir neatļauta rakstzīme"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP vai CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN veids"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Dzēst APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Jauns APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Saglabāt"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Savienojuma izveide var ilgt dažas minūtes..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Lai turpinātu iestatīšanu, pieskarieties "<b>"Tālāk"</b>"."\n\n"Lai izveidotu savienojumu ar citu WiFi tīklu, pieskarieties "<b>"Atpakaļ"</b>"."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Sinhronizācijas iestatījumi"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Pašreiz ir sinhronizācijas problēmas. Drīz šī darbība atkal būs pieejama."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Pievienot kontu"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Visp. sinhronizācijas iestat."</string>
     <string name="background_data" msgid="5779592891375473817">"Fona dati"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Lietojumpr. var sinhr., sūtīt un saņemt datus jebkurā brīdī"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Uzmanību!"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Atspējojot fona datus, tiek paildzināts akumulatora darbības mūža ilgums un samazināts datu lietojums. Dažās lietojumprogrammās joprojām var tikt izmantots fona datu savienojums."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automātiska sinhronizācija"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Lietojumprogrammas automātiski sinhronizē datus"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Kontu pārvaldība"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinhr. ir IESLĒGTA"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Sinhroniz. kļūda"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Dublēšanas iestatījumi"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Iestatījumu dublēšana"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinhronizēt tūlīt"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Atcelt sinhronizāciju"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Pieskarieties, lai sinhronizētu tūlīt<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendārs"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktpersonas"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Laipni lūdzam Google sinhronizācijā!"</font>" "\n"Tā ir Google pieeja datu sinhronizācijai, kas ļauj piekļūt kontaktpersonām, darba uzdevumiem un citiem datiem no jebkuras vietas."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Lietojumprogrammas sinhronizācijas iestatījumi"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dati un sinhronizācija"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index fbf7fcc..740d3b3 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"To minutter"</item>
+    <item msgid="5780349442819375570">"Fem minutter"</item>
+    <item msgid="1166466894270177580">"Én time"</item>
+    <item msgid="9032073376232198148">"Aldri"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dårlig"</item>
     <item msgid="5615082285463430971">"Akseptabel"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ingen"</item>
-    <item msgid="6267482274276126058">"Statisk"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statisk"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Av"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP eller CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Intern lagringsenhet"</item>
     <item msgid="3738430123799803530">"Flyttbart minnekort"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4a30376..3df7ff9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlig"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Synlig i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Synlig"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gjør enheten synlig"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Synlig tidsavbrudd"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Angi hvor lenge enheten skal være synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås taleanrop"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Forhindrer bruk av Bluetooth-telefon når skjermen er låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheter"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Et program på nettbrettet spør om tillatelse til å slå på Bluetooth. Ønsker du å gjøre dette?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Et program på nettbrettet ber om tillatelse til å gjøre nettbrettet synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"En applikasjon på telefonen spør om tillatelse for å gjøre telefonen synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Et program på nettbrettet ber om tillatelse til å gjøre nettbrettet permanent synlig for andre Bluetooth-enheter. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Et program på telefonen ber om tillatelse til å gjøre telefonen permanent synlig for andre Bluetooth-enheter. Ønsker du å gjøre dette?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Et program på nettbrettet ber om tillatelse til å aktivere Bluetooth og gjøre nettbrettet synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"En applikasjon på telefonen spør om tillatelse til å slå på Bluetooth og gjøre telefonen synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Et program på nettbrettet ber om tillatelse til å aktivere Bluetooth og gjøre nettbrettet synlig for andre enheter. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Et program på telefonen ber om tillatelse til å aktivere Bluetooth og gjøre telefonen synlig for andre enheter. Ønsker du å gjøre dette?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverer Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatisk tilkobling"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Innstillinger for dato og tid"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Mellomtjenerinnstillinger"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Angi global HTTP-mellomtjener og eksklusjonslister"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tøm"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Ingen mellomtjener for"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gjenopprett standardinnstillinger"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Ferdig"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Vertsnavn"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Vertsnavn"</string>
     <string name="proxy_error" msgid="8926675299638611451">"NB"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Vertsnavnet er ikke gyldig."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du må skrive inn et portnummer."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Portnummeret er ikke gyldig."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plassering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøk:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Krever numerisk PIN-kode for å låse opp skjermen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Krever passord for å låse opp skjermen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Deaktivert av ekstern enhetsadministrator"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Deaktivert av ekstern enhetsadministrator"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Av"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Usikker"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sikret med mønster"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden må bestå av minst %d tegn"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Trykk på Fortsett når du er ferdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN-koden kan ikke inneholde mer enn %d tegn"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden kan ikke inneholde mer enn %d tegn"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-koden kan kun inneholde tall fra 0 til 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Enhetens administrator tillater ikke bruk av en nylig brukt personlig kode"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Passordet inneholder ugydige tegn"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Slett APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nytt APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Lagre"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 16294d8..1eed3e9 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minuten"</item>
+    <item msgid="5780349442819375570">"5 minuten"</item>
+    <item msgid="1166466894270177580">"1 uur"</item>
+    <item msgid="9032073376232198148">"Nooit"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slecht"</item>
     <item msgid="5615082285463430971">"Redelijk"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Geen"</item>
-    <item msgid="6267482274276126058">"Statisch"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statisch"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Uit"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP of CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interne apparaatopslag"</item>
     <item msgid="3738430123799803530">"Verwisselbare SD-kaart"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 91fdb81..468fc80 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Kan worden gevonden"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Kan gedurende <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> seconden worden gevonden…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Vindbaar"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Zorgen dat het apparaat kan worden gevonden"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Time-out voor vindbaarheid"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Instellen hoe lang het apparaat vindbaar is"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Spraakkeuze vergrendelen"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gebruik van de Bluetooth-dialer voorkomen wanneer het scherm is vergrendeld"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-apparaten"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Een toepassing vraagt toestemming Bluetooth in te schakelen. Wilt u dit toestaan?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Een toepassing op uw tablet vraagt toestemming uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Een toepassing probeert uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Een toepassing op uw tablet vraagt toestemming uw tablet altijd vindbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Een toepassing op uw telefoon vraagt toestemming uw tablet altijd vindbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Een toepassing op uw tablet vraagt toestemming Bluetooth in te schakelen en uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Een toepassing probeert Bluetooth in te schakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Een toepassing op uw tablet vraagt toestemming Bluetooth in te schakelen en uw tablet vindbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Een toepassing op uw telefoon vraagt toestemming Bluetooth in te schakelen en uw telefoon vindbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth inschakelen…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatisch verbinding maken"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum- en tijdinstellingen"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxyinstellingen"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Algemene HTTP-proxy en uitsluitingslijsten instellen"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wissen"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Poort"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Poort"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Geen proxy voor"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standaardwaarden herstellen"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Gereed"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Hostnaam"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Hostnaam"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Let op"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"De hostnaam die u heeft ingevoerd, is ongeldig."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"U moet het poortveld invullen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Het poortveld moet leeg zijn als het hostveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"De poort die u heeft ingevoerd, is ongeldig."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locatie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Gegevenspogingen:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Numerieke PIN-code vereist voor schermontgr."</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wachtwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Wachtwoord vereist voor schermontgrendeling"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Uitgeschakeld door externe apparaatbeheerder"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Uitgeschakeld door externe apparaatbeheerder"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Uitgeschakeld"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Niet-beveiligd"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Beveiligd met patroon"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-code moet ten minste %d tekens lang zijn"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Raak \'Doorgaan\' aan als u klaar bent"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Doorgaan"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN-code mag niet langer zijn dan %d cijfers"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-code mag niet langer zijn dan %d cijfers"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-code mag alleen de cijfers 0-9 bevatten"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Apparaatbeheerder staat gebruik van een recente PIN-code niet toe"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Wachtwoord bevat een ongeldig teken"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP of CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN verwijderen"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nieuwe APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Opslaan"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index d768d7b..7c4218f 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minuty"</item>
+    <item msgid="5780349442819375570">"5 minut"</item>
+    <item msgid="1166466894270177580">"1 godzina"</item>
+    <item msgid="9032073376232198148">"Nigdy"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Słaba"</item>
     <item msgid="5615082285463430971">"Dostateczna"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Brak"</item>
-    <item msgid="6267482274276126058">"Statyczny"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statyczny"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Wyłączony"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP lub CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Wewnętrzna pamięć urządzenia"</item>
     <item msgid="3738430123799803530">"Wymienna karta SD"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ebb4d13..b52aa6b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Wykrywalny"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Wykrywalny przez <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s …"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Wykrywalny"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Zezwalaj na wykrywanie urządzenia"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Czas wykrywalności"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ustaw czas, przez jaki urządzenie będzie wykrywalne"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zablokuj wybieranie głosowe"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zapobiegaj używaniu wybierania Bluetooth, gdy ekran jest zablokowany"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Lista urządzeń"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikacja prosi o pozwolenie na włączenie modułu Bluetooth. Czy chcesz na to zezwolić?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikacja w tablecie prosi o pozwolenie na ustawienie tabletu jako wykrywalnego przez inne urządzenia Bluetooth na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikacja w telefonie prosi o pozwolenie na ustawienie telefonu jako wykrywalnego przez inne urządzenia Bluetooth na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikacja w tablecie prosi o pozwolenie na ustawienie tabletu jako zawsze wykrywalnego przez inne urządzenia Bluetooth. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikacja w telefonie prosi o pozwolenie na ustawienie telefonu jako zawsze wykrywalnego przez inne urządzenia Bluetooth. Czy chcesz na to zezwolić?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikacja w tablecie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie tabletu jako wykrywalnego przez inne urządzenia na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikacja w telefonie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie telefonu jako wykrywalnego przez inne urządzenia na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikacja w tablecie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie tabletu jako wykrywalnego przez inne urządzenia. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikacja w telefonie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie telefonu jako wykrywalnego przez inne urządzenia. Czy chcesz na to zezwolić?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Trwa włączanie modułu Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Połącz automatycznie"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ustawienia daty i godziny"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Ustawienia serwera proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Ustaw globalny serwer proxy HTTP i listę wykluczeń"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wyczyść"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Brak serwera proxy dla"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Przywróć ustawienia domyślne"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Gotowe"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nazwa hosta"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nazwa hosta"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Uwaga"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Wprowadzona nazwa hosta jest nieprawidłowa."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Należy uzupełnić pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pole port musi być puste, jeśli pole host jest puste."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Wprowadzony port jest nieprawidłowy."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokalizacja:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sąsiadujący CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Próby danych:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Wymagaj kodu PIN do odblokowania ekranu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Hasło"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Wymagaj hasła do odblokowania ekranu"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Wyłączone przez zdalnego administratora urządzenia"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Wyłączone przez zdalnego administratora urządzenia"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Wyłącz"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Brak zabezpieczenia"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpieczenie wzorem"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Liczba znaków w kodzie PIN musi wynosić co najmniej %d"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Po zakończeniu dotknij opcji Kontynuuj"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Kontynuuj"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Liczba cyfr w kodzie PIN nie może przekraczać %d"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Liczba cyfr w kodzie PIN nie może przekraczać %d"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Kod PIN musi zawierać wyłącznie cyfry 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Administrator urządzenia nie zezwala na używanie poprzedniego kodu PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Hasło zawiera niedozwolony znak"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP lub CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Typ APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Usuń APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nowa nazwa APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Zapisz"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 5016687..0acf730 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minutos"</item>
+    <item msgid="5780349442819375570">"5 minutos"</item>
+    <item msgid="1166466894270177580">"1 hora"</item>
+    <item msgid="9032073376232198148">"Nunca"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Fraco"</item>
     <item msgid="5615082285463430971">"Suficiente"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nenhum"</item>
-    <item msgid="6267482274276126058">"Estático"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Estático"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desactivada"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ou CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Armazenamento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Cartão SD amovível"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7fd7a91..c9a25ac 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectável durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Detectável"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tempo limite em que é detectável"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir durante quanto tempo ficará o dispositivo detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcação por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar a utilização do telefone Bluetooth quando o ecrã está bloqueado"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Uma aplicação está a pedir autorização para activar o Bluetooth. Pretende fazê-lo?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Uma aplicação do seu tablet está a solicitar autorização para que o seu tablet possa ser detectável por outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Uma aplicação do seu telefone está a solicitar autorização para que o seu telefone possa ser detectado por outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Uma aplicação do tablet está a solicitar autorização para que o seu tablet possa ser \"sempre detectável\" por outros dispositivos Bluetooth. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Uma aplicação do telefone está a solicitar autorização para que o seu telefone possa ser \"sempre detectável\" por outros dispositivos Bluetooth. Pretende fazê-lo?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Uma aplicação do seu tablet está a solicitar autorização para activar o Bluetooth e para que o seu tablet possa ser detectado por outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Uma aplicação do seu telefone está a solicitar autorização para activar o Bluetooth e para que o seu telefone possa ser detectado por outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Uma aplicação do seu tablet está a solicitar autorização para activar o Bluetooth e para que o seu tablet seja detectável por outros dispositivos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Uma aplicação do telefone está a solicitar autorização para activar o Bluetooth e para que o seu telefone seja detectável por outros dispositivos. Pretende fazê-lo?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"A ligar Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Ligação automática"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Definições de data e hora"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Definições de proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Definir o proxy HTTP global e as listas de exclusão"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Porta"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Não há proxy para"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar predefinições"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Concluído"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome de anfitrião"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nome de anfitrião"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenção"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"O nome de anfitrião que introduziu não é válido."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"É necessário preencher o campo referente à porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo referente à porta tem de estar vazio se o campo do anfitrião estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"A porta que introduziu não é válida."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Local:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Requer PIN numérico para desbloquear o ecrã"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Palavra-passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Requer palavra-passe para desbloquear o ecrã"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Desactiv. pelo adminis. do dispositivo remoto"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Desactiv. pelo adminis. do dispositivo remoto"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desligar"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Desprotegido"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com sequência"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN tem de ter no mínimo %d caracteres"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Toque em Continuar quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"O PIN não pode ter mais de %d dígitos"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"O PIN não pode ter mais de %d dígitos"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"O PIN tem de conter apenas dígitos de 0 a 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"O administrador do dispositivo proíbe a utilização de um PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"A palavra-passe contém um carácter ilegal"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ou CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"A ligação pode demorar alguns minutos..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toque em "<b>"Seguinte"</b>" para continuar a configuração."\n\n"Toque em "<b>"Anterior"</b>" para ligar a uma rede Wi-Fi diferente."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Definições de sincronização"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está actualmente com problemas e será retomada em breve."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Def. gerais de sincronização"</string>
     <string name="background_data" msgid="5779592891375473817">"Dados em segundo plano"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Aplic. podem sincr., enviar/receber dados a qualq. momento"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Atenção"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"A desactivação de dados em segundo plano economiza a bateria e reduz a utilização de dados. Algumas aplicações podem continuar a utilizar a ligação de dados em segundo plano."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Sincronização automática"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"As aplicações sincronizam os dados automaticamente"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Gerir contas"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincron. activada"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Erro de sincron."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Efectuar uma cópia de segurança das definições"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Fazer uma cópia de segurança das minhas definições"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizar agora"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancelar sincronização"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Tocar para sincronizar agora<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Calendário"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bem vindo ao Google Sync!"</font>" "\n"Uma abordagem do Google à sincronização de dados, que permite aceder aos contactos, compromissos e outros itens, a partir de qualquer local onde se encontre."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Definições de sincronização da aplicação"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dados e sincronização"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 788a81e..5032305 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minutos"</item>
+    <item msgid="5780349442819375570">"5 minutos"</item>
+    <item msgid="1166466894270177580">"1 hora"</item>
+    <item msgid="9032073376232198148">"Nunca"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Ruim"</item>
     <item msgid="5615082285463430971">"Bom"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nenhum"</item>
-    <item msgid="6267482274276126058">"Estático"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Estático"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desativado"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ou CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Armazenamento do dispositivo interno"</item>
     <item msgid="3738430123799803530">"Cartão SD removível"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1d697f1..5566643 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectável por <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Detectável"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Detectável por tempo limite"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir por quanto tempo o aparelho ficará detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear discagem por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir o uso do discador Bluetooth quando a tela estiver bloqueada."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Um aplicativo está solicitando permissão para ativar o Bluetooth. Deseja fazer isso?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Um aplicativo em seu tablet está solicitando permissão para tornar seu tablet detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Um aplicativo no seu telefone está solicitando permissão para tornar o seu telefone detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Um aplicativo em seu tablet está solicitando permissão para tornar seu tablet sempre detectável por outros dispositivos Bluetooth. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Um aplicativo no seu telefone está solicitando permissão para tornar o seu telefone sempre detectável por outros dispositivos Bluetooth. Deseja fazer isso?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Um aplicativo em seu tablet está solicitando permissão para ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Um aplicativo no seu telefone está solicitando permissão para ativar o Bluetooth e tornar o seu telefone detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Um aplicativo em seu tablet está solicitando permissão para ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Um aplicativo em seu telefone está solicitando permissão para ativar o Bluetooth e tornar o seu telefone detectável por outros dispositivos. Deseja fazer isso?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ativando Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Conexão automática"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configurações de data e hora"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Configurações de proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Define o proxy HTTP geral e as listas de exclusão"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Porta"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Não há nenhum proxy para"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar padrões"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Concluído"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome do host"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nome do host"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenção"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"O nome de host digitado não é válido."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Você deve completar o campo de porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo da porta deverá estar vazio se o campo do host estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"A porta digitada não é válida."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Localização:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Exige senha numérica para desbloquear a tela"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Senha"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Exige uma senha para desbloquear a tela"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Desativ. pelo administrador remoto do aparelho"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Desativ. pelo administrador remoto do aparelho"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desativado"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Não seguro"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com padrão"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN deve ter no mínimo %d caracteres."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Toque em Continuar quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"O PIN não pode ter mais do que %d dígitos"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"O PIN não pode ter mais do que %d dígitos"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"O PIN precisa conter apenas dígitos de 0 a 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"O administrador do aparelho não permite o uso de um PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"A senha contém um caractere ilegal"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ou CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tipo APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Excluir APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salvar"</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 6cc5333..fba1ef5 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -106,6 +106,10 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:0 (1106621950288502195) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (5780349442819375570) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:2 (1166466894270177580) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:3 (9032073376232198148) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Flaivel"</item>
     <item msgid="5615082285463430971">"Bun"</item>
@@ -144,7 +148,7 @@
     <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
     <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
     <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
-    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
+    <!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Deactivà"</item>
     <item msgid="3165868966179561687">"Avis"</item>
@@ -156,6 +160,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP u CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Memoria interna da telefonin"</item>
     <item msgid="3738430123799803530">"Carta SD che po vegnir barattada"</item>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 4abf2ab..f85a587 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -92,7 +92,13 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visibel"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visibel durant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secundas…"</string>
+    <!-- no translation found for bluetooth_is_discoverable_always (8573385118329733931) -->
+    <skip />
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Far daventar visibel l\'apparat"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (6634508002347847278) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
+    <skip />
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloccar la cumposiziun vocala"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir l\'utilisaziun dal dialer bluetooth sch\'il visur è bloccà"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Apparats Bluetooth"</string>
@@ -124,9 +130,17 @@
     <!-- no translation found for bluetooth_ask_discovery (5950965604673262829) -->
     <skip />
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Ina applicaziun sin Voss telefonin dumonda l\'autorisaziun dad activar la visibilitad da Voss telefonin per auters apparats da bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> secundas. Vulais Vus quai?"</string>
+    <!-- no translation found for bluetooth_ask_lasting_discovery (1680661751413856600) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (3413855805411554871) -->
+    <skip />
     <!-- no translation found for bluetooth_ask_enablement_and_discovery (5716077575971497298) -->
     <skip />
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Ina applicaziun sin Voss telefonin dumonda l\'autorisaziun dad activar bluetooth e far visibel Voss telefonin per auters apparats durant <xliff:g id="TIMEOUT">%1$d</xliff:g> secundas. Vulais Vus quai?"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6132824454823539873) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (7471195931669103553) -->
+    <skip />
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth vegn activà…"</string>
     <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
     <skip />
@@ -147,11 +161,11 @@
     <!-- outdated translation 6262282922722097473 -->     <string name="proxy_settings_title" msgid="5912878565897294401">"Parameters proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Definir il proxy HTTP global e las glistas d\'exclusiun"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Stizzar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nagin proxy per"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar il standard"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Finì"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Num da host"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Num da host"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Attenziun"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Il num da host endatà è nunvalid."</string>
@@ -159,6 +173,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Vus stuais endatar ina valur en il champ Port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"\"Il champ «Port» sto esser vid, sch\'il champ «Host» è vid.\""</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Il port endatà è nunvalid."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posiziun:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vischin:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Emprovas datas:"</string>
@@ -354,7 +370,7 @@
     <!-- outdated translation 4131169672844263316 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Endatai in PIN numeric per debloccar il visur"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Pled-clav"</string>
     <!-- outdated translation 4623254789833899286 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Endatai in pled-clav per debloccar il visur"</string>
-    <!-- outdated translation 736557879526940324 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Deactivà dad in administratur a distanza"</string>
+    <!-- outdated translation 736557879526940324 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Deactivà dad in administratur a distanza"</string>
     <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
     <skip />
     <!-- no translation found for unlock_set_unlock_mode_none (7953821968316697309) -->
@@ -376,8 +392,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN sto cuntegnair almain %d caracters."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Smatgai sin Vinavant sche Vus essas a fin."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Vinavant"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Il PIN dastga cuntegnair maximalmain %d caracters."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Il PIN dastga sin il pli cuntegnair %d segns."</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Il PIN dastga mo cuntegnair las cifras 0-9."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"L\'administratur dad apparats na permetta betg l\'utilisaziun dad in PIN precedent"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Il pled-clav cuntegna in caracter nunvalid."</string>
@@ -501,7 +519,9 @@
     <skip />
     <!-- no translation found for nfc_quick_toggle_summary (1988408027741447231) -->
     <skip />
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Ina errur è succedida."</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar WLAN"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Parameters WLAN"</string>
@@ -798,6 +818,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP u CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tip dad APN (num dal punct d\'access)"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Stizzar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nov APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Memorisar"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 53b8f2c..49428b4 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minute"</item>
+    <item msgid="5780349442819375570">"5 minute"</item>
+    <item msgid="1166466894270177580">"1 oră"</item>
+    <item msgid="9032073376232198148">"Niciodată"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slab"</item>
     <item msgid="5615082285463430971">"Corect"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Niciunul"</item>
-    <item msgid="6267482274276126058">"Static"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Static"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Dezactivate"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP sau CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Stocare internă pe dispozitiv"</item>
     <item msgid="3738430123799803530">"Card SD detaşabil"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2516b01..8034579 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectabil"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectabil pentru <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> (de) secunde…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Detectabil"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Setaţi dispozitivul ca detectabil"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Timp limită pentru detectare"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setaţi cât timp va fi detectabil dispozitivul"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocaţi apelarea vocală"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Împiedicaţi apelarea prin Bluetooth când este blocat ecranul"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispozitive Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"O aplicaţie solicită permisiunea de a activa Bluetooth. Acordaţi permisiunea?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"O aplicaţie de pe tabletă solicită permisiunea ca aceasta să poată fi descoperită de alte dispozitive Bluetooth timp de <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Acordaţi permisiunea?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a seta telefonul dvs. ca detectabil de către alte dispozitive Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Doriţi să faceţi acest lucru?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"O aplicaţie de pe tabletă solicită permisiunea ca aceasta să poată fi „detectabilă întotdeauna” de alte dispozitive Bluetooth. Acordaţi permisiunea?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"O aplicaţie de pe telefonul dvs. solicită permisiunea ca acesta să poată fi „detectabil întotdeauna” de alte dispozitive Bluetooth. Acordaţi permisiunea?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"O aplicaţie de pe tabletă solicită permisiunea de activare Bluetooth, astfel încât aceasta să poată fi descoperită de alte dispozitive timp de <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Acordaţi permisiunea?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a activa Bluetooth şi să seteze telefonul dvs. ca detectabil de către alte dispozitive timp de <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Doriţi să faceţi acest lucru?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"O aplicaţie de pe tabletă solicită permisiunea de activare Bluetooth, astfel încât aceasta să fie detectabilă de alte dispozitive. Acordaţi permisiunea?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a activa Bluetooth şi de a seta telefonul pentru a fi detectabil de alte dispozitive. Acordaţi permisiunea?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Se activează Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Conectare automată"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setări privind data şi ora"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Setări proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Setaţi serverul proxy HTTP global şi listele de excludere"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ştergeţi"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Fără proxy pentru"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restabiliţi valorile prestabilite"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Terminat"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nume de gazdă"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nume de gazdă"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenţie"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Numele de gazdă introdus nu este valid."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Trebuie să completaţi câmpul pentru port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Câmpul pentru port trebuie să fie necompletat în situaţia în care câmpul pentru gazdă este necompletat."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Portul introdus nu este valid."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Încercări de date:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Necesită PIN numeric pentru debloc. ecran."</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parolă"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Se solicită parolă pentru deblocare ecran"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Dezactivată de administratorul dispozitivelor la distanţă"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Dezactivată de administratorul dispozitivelor la distanţă"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Dezactivată"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Nesecurizat"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Securizat cu model"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Codul PIN trebuie să conţin minimum %d (de) caractere"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Atingeţi Continuaţi la terminare"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuaţi"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Codul PIN nu poate conţine mai mult de %d (de) cifre"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Codul PIN nu poate conţine mai mult de %d (de) cifre"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Codul PIN trebuie să conţină numai cifre de la 0 la 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Admin. dispoz. refuză utiliz. unui PIN recent"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Parola conţine un caracter nepermis"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP sau CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Tip APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Ştergeţi APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nou"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salvaţi"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Conectarea poate dura câteva minute..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Atingeţi "<b>"Înainte"</b>" pentru a continua configurarea."\n\n"Atingeţi "<b>"Înapoi"</b>" pentru a vă conecta la o altă reţea Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Setări de sincronizare"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Sincronizarea se confruntă în prezent cu probleme. Aceasta va fi funcţională în curând."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Adăugaţi un cont"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Setări sincronizare generale"</string>
     <string name="background_data" msgid="5779592891375473817">"Date de fundal"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Aplicaţiile pot oricând sincroniza, trimite şi primi date"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Atenţie"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Dezactivarea datelor de fundal creşte durata de viaţă a bateriei şi reduce nivelul de utilizare a datelor. Anumite aplicaţii pot utiliza în continuare conexiunea de date de fundal."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Sincronizare automată"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplicaţiile sincronizează datele automat"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Gestionaţi conturi"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinc. este ACTIVATĂ"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Eroare de sincroniz."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Setări copie de rezervă"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Creaţi o copie de rezervă a setărilor dvs."</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizaţi acum"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Anulaţi sincronizarea"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Atingeţi pentru a sincroniza acum<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Agendă"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" "\n"O abordare Google asupra sincronizării datelor, care permite accesul la persoanele de contact, întâlniri şi multe alte informaţii, oriunde v-aţi afla."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Setări privind sincronizarea aplicaţiei"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datele şi sincronizarea"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 0ad8eb1..1fdeb7a 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 минуты"</item>
+    <item msgid="5780349442819375570">"5 минут"</item>
+    <item msgid="1166466894270177580">"1 час"</item>
+    <item msgid="9032073376232198148">"Никогда"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабый"</item>
     <item msgid="5615082285463430971">"Хороший"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Нет"</item>
-    <item msgid="6267482274276126058">"Статический"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Статический"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Выкл."</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP или CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Внутренняя память устройства"</item>
     <item msgid="3738430123799803530">"Съемная SD-карта"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9e1dac9..5290ec9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимость"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Видимый в течение <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> секунд..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Видимый"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Сделать устройство видимым"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Тайм-аут видимости"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Укажите, в течение какого времени устройство будет видимым"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблокировать голосовой набор"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратить использование телефона Bluetooth, когда экран заблокирован"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Устройства Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Приложение на вашем планшетном ПК запрашивает разрешение на включение Bluetooth. Разрешить?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Приложение на вашем планшетном ПК запрашивает разрешение на включение режима видимости по Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Приложение на вашем телефоне запрашивает разрешение на включение видимого режима Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Приложение на планшетном ПК запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Приложение на телефоне запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Приложение на вашем планшетном ПК запрашивает разрешение на включение Bluetooth и режима видимости на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Приложение на вашем телефоне запрашивает разрешение на включение Bluetooth и видимого режима на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Приложение на планшетном ПК запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Приложение на телефоне запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Включается Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Автоматическое соединение"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки даты и времени"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Настройки прокси-сервера"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Настройка глобального прокси HTTP и списка исключений"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Очистить"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Порт"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Нет прокси:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Восстановить настройки по умолчанию"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Готово"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Имя узла"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Имя узла"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Внимание!"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ОК"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Введено недействительное имя узла."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Необходимо заполнить поле порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Если поле хоста не заполнено, поле порта также следует оставить пустым."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Введен недействительный порт."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Соседний CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Попыток данных:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Требовать цифровой PIN-код для разбл. экрана"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Требовать пароль для разблокировки экрана"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Запрещено удаленным администратором"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Запрещено удаленным администратором"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Выкл."</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Нет защиты"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Защита графическим ключом"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"ПИН-код должен содержать не менее %d символов"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"После завершения нажмите \"Продолжить\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжить"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"ПИН-код не может быть длиннее %d симв."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"ПИН-код не может быть длиннее %d симв."</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"ПИН-код должен состоять только из цифр от 0 до 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Администратор устройства запрещает использование последнего PIN-кода"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Пароль содержит недопустимые символы"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP или CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Тип APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Удалить APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Новая точка доступа"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сохранить"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index e80e6d7..6c0089f 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minúty"</item>
+    <item msgid="5780349442819375570">"5 minút"</item>
+    <item msgid="1166466894270177580">"1 hodina"</item>
+    <item msgid="9032073376232198148">"Nikdy"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Nízka"</item>
     <item msgid="5615082285463430971">"Dostatočná"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Žiadne"</item>
-    <item msgid="6267482274276126058">"Statická"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statická"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Vypnuté"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP alebo CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interný ukladací priestor zariadenia"</item>
     <item msgid="3738430123799803530">"Odnímateľná karta SD"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d1ed439..2f485f7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditeľné"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Zariadenie je viditeľné v intervale <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Viditeľné"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Prepne zariadenie do viditeľného režimu"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Časový limit viditeľného režimu vypršal"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavte dobu, počas ktorej bude zariadenie vo viditeľnom režime"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknúť hlasové vytáčanie"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabrániť použitiu vytáčania Bluetooth pri uzamknutej obrazovke"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Zariadenia Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Aplikácia vyžaduje povolenie na zapnutie pripojenia Bluetooth. Chcete udeliť toto povolenie?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikácia v tablete požaduje povolenie na nastavenie tabletu do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikácia v telefóne požaduje povolenie na nastavenie telefónu do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikácia v tablete vyžaduje povolenie na trvalé nastavenie tabletu do viditeľného režimu pre ostatné zariadenia Bluetooth. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikácia v telefóne vyžaduje povolenie na trvalé nastavenie telefónu do viditeľného režimu pre ostatné zariadenia Bluetooth. Chcete udeliť toto povolenie?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikácia v tablete požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie tabletu do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikácia v telefóne požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie telefónu do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikácia v tablete požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie tabletu do viditeľného režimu. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikácia v telefóne požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie telefónu do viditeľného režimu. Chcete udeliť toto povolenie?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Prebieha zapínanie rozhrania Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automaticky pripojiť"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavenia dátumu a času"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavenia servera proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Nastavenie globálneho servera proxy protokolu HTTP a zoznamu vylúčení"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazať"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nepoužívať server proxy na"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnoviť predvolené nastavenia"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Hotovo"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Názov hostiteľa"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Názov hostiteľa"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pozor"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Zadaný názov hostiteľa nie je platný."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Treba vyplniť pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ak je pole hostiteľ prázdne, musí byť prázdne aj pole port."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Zadaný port nie je platný."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Poloha:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedný identifikátor CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy údajov:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Požadovať na odomknutie obrazovky číselný kód PIN"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Požadovať heslo na odomknutie obrazovky"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Zakázané vzdialeným správcom zariadenia"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Zakázané vzdialeným správcom zariadenia"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Vypnuté"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Nezabezpečené"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečené vzorom"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovať najmenej %d znakov"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Po dokončení sa dotknite tlačidla Pokračovať"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovať"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Kód PIN nemôže obsahovať viac ako %d číslic"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Kód PIN nemôže obsahovať viac ako %d číslic"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Kód PIN musí obsahovať len číslice 0 až 9."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Správca zariadenia nepovoľuje použiť nedávno použité PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Heslo obsahuje neplatný znak"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP alebo CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Typ názvu prístupového bodu (APN)"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Odstrániť názov prístupového bodu (APN)"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nový názov prístupového bodu (APN)"</string>
     <string name="menu_save" msgid="8109345640668285399">"Uložiť"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Pripájanie môže trvať niekoľko minút..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>"."\n\n"Ak sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Nastavenia synchronizácie"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Vyskytli sa problémy so synchronizáciou. Služba bude čoskoro obnovená."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Pridať účet"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Všeobecné nast. synchronizácie"</string>
     <string name="background_data" msgid="5779592891375473817">"Údaje na pozadí"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Aplikácie môžu kedykoľvek synchronizovať, odosielať a prijímať údaje."</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Pozor"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Zakázanie prenosu údajov na pozadí šetrí batériu a znižuje objem použitých údajov. Niektoré aplikácie môžu používať dátové pripojenie na pozadí aj napriek tomuto nastaveniu."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automatická synchronizácia"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikácie synchronizujú údaje automaticky"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Spravovať účty"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronizácia je ZAPNUTÁ"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Chyba synchronizácie"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Zálohovať nastavenia"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Zálohovať moje nastavenia"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizovať"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Zrušiť synchronizáciu"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Dotykom vykonáte synchronizáciu<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendár"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Víta vás služba Google Sync"</font>" "\n"Spoločnosť Google pomocou nej synchronizuje údaje a umožňuje tak používateľom pristupovať ku kontaktom, stretnutiam a ďalším informáciám, kdekoľvek sa nachádzate."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Nastavenia synchronizácie aplikácií"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Údaje a synchronizácia"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index cc260d1..892c413 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minuti"</item>
+    <item msgid="5780349442819375570">"5 minut"</item>
+    <item msgid="1166466894270177580">"1 ura"</item>
+    <item msgid="9032073376232198148">"Nikoli"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slaba"</item>
     <item msgid="5615082285463430971">"Zadovoljiva"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Brez"</item>
-    <item msgid="6267482274276126058">"Statično"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statično"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Izklopljeno"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ali CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Notranji pomnilnik naprave"</item>
     <item msgid="3738430123799803530">"Izmenljiva kartica SD"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bd2b6de..c7d0eed 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viden"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Viden <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekund …"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Viden"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Naj bo naprava vidna drugim"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Omejitev trajanja vidnosti"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavite trajanje vidnosti naprave"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zakleni glasovno klicanje"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prepreči uporabo telefona Bluetooth, kadar je zaslon zaklenjen"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Naprave Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Program zahteva dovoljenje za vklop Bluetootha. Ali dovolite?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Program v tabličnem računalniku zahteva dovoljenje, da bodo druge naprave Bluetooth lahko odkrile računalnik za <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Ali dovolite?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Eden od programov v telefonu zahteva dovoljenje, da za <xliff:g id="TIMEOUT">%1$d</xliff:g> sekund omogoči vidnost telefona drugim napravam. Ali želite to storiti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Program v tabličnem računalniku zahteva dovoljenje, da bodo lahko druge naprave Bluetooth »vedno odkrile« računalnik. Ali se strinjate s tem?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Eden od programov v telefonu zahteva dovoljenje, da bodo lahko druge naprave Bluetooth »vedno odkrile« telefon. Ali se strinjate s tem?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Program v tabličnem računalniku zahteva dovoljenje za vklop Bluetootha, da bodo druge naprave bodo lahko odkrile računalnik (<xliff:g id="TIMEOUT">%1$d</xliff:g> s). Ali dovolite?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Eden od programov v telefonu zahteva dovoljenje, da vklopi Bluetooth in za <xliff:g id="TIMEOUT">%1$d</xliff:g> sekund omogoči vidnost telefona drugim napravam. Ali želite to storiti?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Eden od programov v tabličnem računalniku zahteva dovoljenje, da vklopi Bluetooth in omogoči vidnost tabličnega računalnika drugim napravam. Ali se strinjate s tem?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Eden od programov v telefonu zahteva dovoljenje, da vklopi Bluetooth in omogoči vidnost telefona drugim napravam. Ali se strinjate s tem?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Vklop Bluetootha …"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Samodejna povezava"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum in nastavitve"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavitve strežnika proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Nastavi globalni strežnik HTTP proxy in seznam izločitev"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Počisti"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Vrata"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Vrata"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Brez strežnika proxy:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ponastavi na privzeto"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Končano"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Ime gostitelja"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Ime gostitelja"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pozor"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"V redu"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Ime gostitelja, ki ste ga vtipkali, ni veljavno."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Izpolniti morate polje za vrata."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Če je polje za gostitelja prazno, mora biti prazno tudi polje za vrata."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Vtipkana številka vrat je neveljavna."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID v bližini:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Podatkovni poskusi:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Zahtevaj številski PIN za odklep. zaslona"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Geslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Zahtevaj geslo za odklepanje zaslona"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Onemogočil oddaljeni skrbnik naprave"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Onemogočil oddaljeni skrbnik naprave"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Izklopljeno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Nezaščiten"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zaščiten z vzorcem"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Koda PIN mora vsebovati vsaj %d znakov"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Ko končate, se dotaknite »Nadaljuj«"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Naprej"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Koda PIN lahko vsebuje največ %d števk"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Koda PIN lahko vsebuje največ %d števk"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Koda PIN sme vsebovati samo števke od 0 do 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Skrbnik naprave ne dovoli uporabe nedavne kode PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Geslo vsebuje neveljaven znak"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ali CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Vrsta APN-ja"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Izbriši APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nov APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Shrani"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Vzpostavljanje povezave lahko traja nekaj minut ..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Če želite nadaljevati nastavitev, se dotaknite "<b>"Naprej"</b>"."\n\n"Če se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Nastavitve sinhronizacije"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Pri sinhronizaciji je prišlo do težav. Kmalu bo spet na voljo."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Dodaj račun"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Splošne nastavitve sinhroniz."</string>
     <string name="background_data" msgid="5779592891375473817">"Podatki v ozadju"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Programi lahko kadar koli sinhronizirajo, pošiljajo in prejemajo podatke"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Pozor"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Če onemogočite podatke v ozadju, podaljšate življenjsko dobo baterije in zmanjšate rabo podatkov. Nekateri programi bodo mogoče še vedno potrebovali povezavo s podatki v ozadju."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Samodejna sinhronizacija"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Programi samodejno sinhronizirajo podatke"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Upravljanje z računi"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinhroniz. je VKLOP."</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Sinhron. napaka"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Varnostno kopiranje nastavitev"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Varnostno kopiranje nastavitev"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinhroniziraj"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Prekliči sinhronizacijo"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Pritisnite, če želite sinhronizirati<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Koledar"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Stiki"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" "\n"Googlov način sinhroniziranja podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov ne glede na to, kje ste."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Nastavitve sinhronizacije programov"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podatki in sinhronizacija"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index b4af836..eb2c7f2 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 минута"</item>
+    <item msgid="5780349442819375570">"5 минута"</item>
+    <item msgid="1166466894270177580">"1 сат"</item>
+    <item msgid="9032073376232198148">"Никад"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабо"</item>
     <item msgid="5615082285463430971">"Задовољавајућа"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ништа"</item>
-    <item msgid="6267482274276126058">"Статички"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Статички"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Искључено"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP или CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Складиште унутрашњег уређаја"</item>
     <item msgid="3738430123799803530">"Уклоњива SD картица"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 583dab0..37f2f83 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видљив"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Видљив на <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> секунде(и)…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Видљив"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Нека уређај буде видљив"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Време до прекида видљивости"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Подешавање периода у коме ће уређај бити видљив"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Закључај говорно бирање"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Спречи коришћење bluetooth програма за бирање бројева када је екран закључан"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth уређаји"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Апликација захтева дозволу да укључи Bluetooth. Желите ли то да учините?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Апликација са таблета захтева дозволу да таблет учини видљивим другим Bluetooth уређајима на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Желите ли да то учините?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Апликација на телефону захтева дозволу да учини ваш телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли ово да урадите?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Апликација са таблета захтева дозволу да таблет учини „увек видљивим“ за друге Bluetooth уређаје. Желите ли да то урадите?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Апликација на телефону захтева дозволу да телефон учини „увек видљивим“ за друге Bluetooth уређаје. Желите ли да то урадите?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Апликација са таблета захтева дозволу да укључи Bluetooth и таблет учини видљивим другим уређајима на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Желите ли да то учините?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Апликација на телефону захтева дозволу да укључи Bluetooth и да учини ваш телефон видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли ово да урадите?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Апликација на таблету захтева дозволу да укључи Bluetooth и таблет учини видљивим за друге уређаје. Желите ли да то урадите?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Апликација на телефону захтева дозволу да укључи Bluetooth и телефон учини видљивим за друге уређаје. Желите ли да то урадите?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Укључивање Bluetooth-а…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Аутоматско повезивање"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Подешавања датума и времена"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Подешавања за прокси"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Подесите глобални HTTP прокси и листе изузимања"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Обриши"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Порт"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Нема проксија за"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Врати на подразумевано"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Done"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Назив хоста"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Назив хоста"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Пажња"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Потврди"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Унели сте неважећи назив хоста."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Потребно је да попуните поље порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поље за порт мора да буде празно ако је поље за назив хоста празно."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Унели сте неважећи порт."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Локација:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседни ИД клијента:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Покушаји преноса података:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"За откључавање екрана је потребан нумерички PIN"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Лозинка"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Захтевање лозинке за откључавање екрана"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Онемогућио администратор удаљеног уређаја"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Онемогућио администратор удаљеног уређаја"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Искључено"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Необезбеђено"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Обезбеђено помоћу шаблона"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Минимални број знакова у PIN коду је %d"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Додирните „Настави“ када завршите"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Настави"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Максимални број цифара у PIN коду је %d"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Максимални број цифара у PIN коду је %d"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN мора да садржи само бројеве од 0 до 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Администратор уређаја не дозвољава употребу недавно коришћеног PIN-а"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Лозинка садржи неважећи знак"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP или CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Тип назива приступне тачке"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Избриши назив приступне тачке"</string>
     <string name="menu_new" msgid="3014205883303921729">"Нов назив приступне тачке"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сачувај"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Повезивање може да потраје неколико минута..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Додирните "<b>"Следеће"</b>" да бисте наставили са подешавањем."\n\n"Додирните "<b>"Назад"</b>" да бисте се повезали са другом Wi-Fi мрежом."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Подешавања сихронизације"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизација тренутно има проблема. Ускоро ће се вратити."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Додај налог"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Подеш. опште синхронизације"</string>
     <string name="background_data" msgid="5779592891375473817">"Подаци о позадини"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Апликације увек могу да синхронизују, шаљу и примају податке"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Пажња"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Ако онемогућите позадинске податке, батерија ће трајати дуже, а употреба података ће бити мања. Неке апликације ће можда и даље користити везу са позадинским подацима."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Аутоматски синхронизуј"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Апликације синхронизују податке аутоматски"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Управљање налозима"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Синхрон. је УКЉУЧЕНА"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Грешка при синхрон."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Направи резервну копију подешавања"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Прављење резервне копије подешавања"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронизуј"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Откажи синхронизацију"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Додирните да бисте синхронизовали одмах<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добро дошли у Google синхронизацију!"</font>" "\n"Google-ов приступ синхронизовању података како би се омогућио приступ контактима, обавезама и још много чему без обзира где се налазите."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Подешавања синхронизације апликације"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Подаци и синхронизација"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index f7301af..8b70e87 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 minuter"</item>
+    <item msgid="5780349442819375570">"5 minuter"</item>
+    <item msgid="1166466894270177580">"1 timme"</item>
+    <item msgid="9032073376232198148">"Aldrig"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dålig"</item>
     <item msgid="5615082285463430971">"Ganska bra"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ingen"</item>
-    <item msgid="6267482274276126058">"Statisk"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statisk"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Av"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP eller CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Lagring på intern enhet"</item>
     <item msgid="3738430123799803530">"Flyttbart SD-kort"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 15d39ef..b3e9f5f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlighet"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Synlig i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Synlig"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gör enheten synlig"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tidsgräns för synlighet"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ange hur länge enheten ska vara synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Röstuppringning med låsskärm"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Förhindra att bluetooth-uppringningsfunktionen används när skärmen är låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheter"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"En app begär tillåtelse att aktivera Bluetooth. Vill du tillåta det?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"En app på pekdatorn begär tillåtelse att göra pekdatorn synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"En app i telefonen begär tillåtelse att göra telefonen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"En app begär tillåtelse att göra pekdatorn ständigt synlig för andra Bluetooth-enheter. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"En app begär tillåtelse att göra telefonen ständigt synlig för andra Bluetooth-enheter. Vill du tillåta det?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"En app på pekdatorn begär tillåtelse att aktivera Bluetooth och göra pekdatorn synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"En app i telefonen begär tillåtelse att aktivera Bluetooth och göra telefonen synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"En app begär tillåtelse att aktivera Bluetooth och göra pekdatorn synlig för andra enheter. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"En app begär tillåtelse att aktivera Bluetooth och göra telefonen synlig för andra enheter. Vill du tillåta det?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverar Bluetooth …"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Anslut automatiskt"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Inställningar för datum och tid"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy-inställningar"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Ange global HTTP-proxy och uteslutningslistor"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Rensa"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Ingen proxyserver för"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Återställ standardinställningar"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Klar"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Värdnamn"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Värdnamn"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Obs!"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Värdnamnet som du har angett är inte giltigt."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du måste fylla i portfältet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfältet måste vara tomt om värdfältet är tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Porten som du har angett är inte giltig."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plats:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Närliggande CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataförsök:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Kräv en PIN-kod för att låsa upp skärmen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lösenord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Kräv lösenord för att låsa upp skärmen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Har inaktiverats av fjärradministratören"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Har inaktiverats av fjärradministratören"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Av"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Oskyddad"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Skyddad med grafiskt lösenord"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden måste innehålla minst %d tecken"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Tryck på Fortsätt när du är färdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsätt"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN-koden får inte innehålla fler än %d siffror"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden får inte innehålla fler än %d siffror"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-koden får bara innehålla siffrorna 0 till 9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Enhetsadministratören tillåter inte att en PIN-kod som använts nyligen används igen"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Lösenordet innehåller ett ogiltigt tecken"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP eller CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-typ"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Ta bort APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nytt APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Spara"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Det kan ta några minuter att ansluta..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tryck på "<b>"Nästa"</b>" om·du vill fortsätta med installationen."\n\n"Tryck på "<b>"Tillbaka"</b>" om du vill ansluta till ett annat Wi-Fi-nätverk."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Synkroniseringsinställningar"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Det är för närvarande problem med synkronisering. Det fungerar igen om en stund."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Lägg till konto"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Allmänna synkinställningar"</string>
     <string name="background_data" msgid="5779592891375473817">"Bakgrundsdata"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Appar kan synkronisera, skicka och ta emot data när som helst"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Obs!"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Om du inaktiverar bakgrundsdata sparar du batteri och minskar dataanvändning. Vissa program kanske fortfarande använder anslutningen för bakgrundsdata."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automatisk synkronisering"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Programmen synkroniserar data automatiskt"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Hantera konton"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering är på"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfel"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Säkerhetskopiera inställningar"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Säkerhetskopiera mina inställningar"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synka nu"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Avbryt synkronisering"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Tryck om du vill synkronisera nu<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontakter"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Välkommen till Google Synk!"</font>" "\n"Med Googles verktyg för att synkronisera data kommer du åt dina kontakter, kalendrar och annan information var du än befinner dig."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Synkronisering för appar"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data och synkronisering"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index f8e40dd..a6f1318 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 นาที"</item>
+    <item msgid="5780349442819375570">"5 นาที"</item>
+    <item msgid="1166466894270177580">"1 ชั่วโมง"</item>
+    <item msgid="9032073376232198148">"ไม่ใช้"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"แย่"</item>
     <item msgid="5615082285463430971">"พอใช้"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"ไม่มี"</item>
-    <item msgid="6267482274276126058">"คงที่"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"คงที่"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"ปิด"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP หรือ CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"ที่จัดเก็บข้อมูลอุปกรณ์ภายใน"</item>
     <item msgid="3738430123799803530">"การ์ด SD แบบนำออกได้"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1748fe5..6fa9877 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"บลูทูธ"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"ค้นพบได้"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"ค้นพบได้เป็นเวลา <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> วินาที…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"ค้นพบได้"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"ทำให้ค้นพบอุปกรณ์ได้"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"ระยะหมดเวลาที่จะค้นพบได้"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"ตั้งค่าระยะเวลาที่ให้สามารถค้นพบอุปกรณ์ได้"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ล็อกการโทรด้วยเสียง"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ป้องกันการใช้โปรแกรมโทรออกผ่านบลูทูธเมื่อล็อกหน้าจอไว้"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"อุปกรณ์บลูทูธ"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"แอปพลิเคชันกำลังขออนุญาตเปิดใช้บลูทูธ คุณต้องการดำเนินการนี้หรือไม่"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"แอปพลิเคชันบนแท็บเล็ตของคุณกำลังขออนุญาตทำให้อุปกรณ์บลูทูธอื่นค้นหาแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณต้องการดำเนินการนี้หรือไม่"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตเพื่อให้อุปกรณ์บลูทูธอื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g>  วินาที คุณต้องการทำตามนี้หรือไม่"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"แอปพลิเคชันบนแท็บเล็ตของคุณกำลังขออนุญาตทำให้อุปกรณ์บลูทูธอื่นค้นพบแท็บเล็ตของคุณในแบบ “ค้นพบได้เสมอ” คุณต้องการดำเนินการนี้หรือไม่"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตทำให้อุปกรณ์บลูทูธอื่นค้นพบโทรศัพท์ของคุณในแบบ \"ค้นพบได้เสมอ\" คุณต้องการดำเนินการนี้หรือไม่"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"แอปพลิเคชันบนแท็บเล็ตของคุณกำลังขออนุญาตเปิดใช้บลูทูธและทำให้อุปกรณ์อื่นค้นหาแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณต้องการดำเนินการนี้หรือไม่"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตเพื่อเปิดบลูทูธและให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณต้องการทำตามนี้หรือไม่"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"แอปพลิเคชันบนแท็บเล็ตของคุณกำลังขออนุญาตเปิดใช้บลูทูธและทำให้อุปกรณ์อื่นค้นพบแท็บเล็ตของคุณได้ คุณต้องการดำเนินการนี้หรือไม่"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตเปิดใช้บลูทูธและทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้ คุณต้องการดำเนินการนี้หรือไม่"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"กำลังเปิดบลูทูธ…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"เชื่อมต่ออัตโนมัติ"</string>
     <string name="date_and_time" msgid="4114084177056654663">"การตั้งเวลาและวันที่"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"การตั้งค่าพร็อกซี"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"ตั้งค่าพร็อกซี HTTP ส่วนกลางและรายการยกเว้น"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"ล้างข้อมูล"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"พอร์ต"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"พอร์ต"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"ไม่มีพร็อกซีสำหรับ"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"คืนค่าเริ่มต้น"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"เสร็จสิ้น"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"ชื่อโฮสต์"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"ชื่อโฮสต์"</string>
     <string name="proxy_error" msgid="8926675299638611451">"โปรดทราบ"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ตกลง"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"ชื่อโฮสต์ที่คุณพิมพ์ไม่ถูกต้อง"</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"คุณต้องกรอกข้อมูลฟิลด์พอร์ต"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ฟิลด์พอร์ตจะต้องว่างถ้าไม่ได้ใส่ข้อมูลฟิลด์โฮสต์"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"พอร์ตที่คุณพิมพ์ไม่ถูกต้อง"</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ตำแหน่ง:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ใกล้เคียง:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ความพยายามใช้ข้อมูล:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"ต้องใช้ PIN ตัวเลขเพื่อปลดล็อคหน้าจอ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"รหัสผ่าน"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"ต้องใช้รหัสผ่านเพื่อปลดล็อคหน้าจอ"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"ปิดการใช้งานโดยผู้ดูแลระบบอุปกรณ์รีโมต"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"ปิดการใช้งานโดยผู้ดูแลระบบอุปกรณ์รีโมต"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"ปิด"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"ไม่รักษาความปลอดภัย"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"รักษาความปลอดภัยด้วยรูปแบบ"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN จะต้องมีอักขระอย่างน้อย %d ตัว"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"แตะ ดำเนินการต่อ เมื่อเสร็จสิ้น"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ดำเนินการต่อ"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN ต้องยาวไม่เกิน %d หลัก"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN ต้องยาวไม่เกิน %d หลัก"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN จะต้องเป็นเลข 0-9 เท่านั้น"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"โปรแกรมควบคุมอุปกรณ์ไม่อนุญาตให้ใช้ PIN ล่าสุด"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"รหัสผ่านมีอักขระที่ไม่ถูกต้อง"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP หรือ CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"ประเภท APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"ลบ APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN ใหม่"</string>
     <string name="menu_save" msgid="8109345640668285399">"บันทึก"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index adaff8d..53998d6 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 Minuto"</item>
+    <item msgid="5780349442819375570">"5 Minuto"</item>
+    <item msgid="1166466894270177580">"1 Oras"</item>
+    <item msgid="9032073376232198148">"Hindi Kailanman"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Mahina"</item>
     <item msgid="5615082285463430971">"Katamtaman"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Wala"</item>
-    <item msgid="6267482274276126058">"Static"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Static"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Naka-off"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Imbakan ng panloob na device"</item>
     <item msgid="3738430123799803530">"Naaalis na SD card"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 72a7ecd..002d714 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Natutuklas"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Katuklas-tuklas para sa <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> (na) segundo…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Natutuklasan"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gawing natutuklas ang device"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Timeout ng natutuklasan"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Itakda kung gaano katagal magiging natutuklasan ang aparato"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"I-lock ang pag-dial gamit ang boses"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Iwasan ang paggamit ng taga-dial ng bluetooth kapag naka-lock ang screen"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Mga device ng bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Humihiling ang application ng pahintulot na i-on ang Bluetooth. Gusto mo ba itong gawin?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Humihiling ng pahintulot ang isang application sa iyong tablet upang gawing nakikita ang iyong tablet ng mga ibang Bluetooth device ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Gusto mo ba itong gawin?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Humihiling ang isang application sa iyong telepono ng pahintulot na gawing natutuklas ang iyong telepono ng ibang mga Bluetooth device sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Humihiling ng pahintulot ang isang application sa iyong tablet na gawing “always discoverable” ang iyong tablet ng ibang mga Bluetooth device. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Humihiling ng pahintulot ang isang application sa iyong telepono upang gawing “always discoverable” ang iyong telepono ng ibang mga Bluetooth device. Gusto mo ba itong gawin?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Humihiling ng pahintulot ang isang application sa iyong tablet na i-on ang Bluetooth at gawing nakikita ang iyong tablet ng ibang mga device ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Gusto mo ba itong gawin?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Ang application na ito sa iyong telepono ay humihiling ng pahintulot upang i-on ang Bluetooth at upang magawang katuklas-tuklas ang iyong telepono ng ibang mga device para sa <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) serbisyo. Gusto mong gawin ito?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Humihiling ng pahintulot ang isang application sa iyong tablet na i-on ang Bluetooth at gawing natutuklasan ang iyong tablet ng ibang mga device. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Humihiling ng pahintulot ang isang application sa iyong telepono na i-on ang Bluetooth at upang gawing natutuklasan ang iyong telepono ng mga ibang device. Gusto mo ba itong gawin?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ino-on ang Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Awtomatikong kumonekta"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Mga setting ng petsa &amp; oras"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Mga setting ng proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Itakda ang pandaigdigang HTTP proxy at mga listahan ng pagbubukod"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"I-clear"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Walang Proxy para sa"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ibalik ang mga default"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Tapos na"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Hostname"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Hostname"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Bigyang pansin"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Hindi wasto ang nai-type mong hostname."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Dapat mong makumpleto ang field ng port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Dapat na walang laman ang field ng port kung walang laman ang field ng host."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Hindi wasto ang port na iyong na-type."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasyon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Katabing CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Mga pagtatangka ng data:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Nangangailangan ng numeric na PIN upang i-unlock ang screen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Nangangailangan ng password upang i-unlock ang screen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Hindi pinagana ng administrator ng remote device"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Hindi pinagana ng administrator ng remote device"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Naka-off"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Hindi secure"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Naka-secure na may pattern"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Dapat na hindi bababa sa %d (na) character ang PIN"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Pindutin ang Magpatuloy kapag tapos na"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Magpatuloy"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Hindi maaaring mas mahaba sa %d (na) digit ang PIN"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Hindi maaaring mas mahaba kaysa sa %d (na) digit ang PIN"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Dapat maglaman ang PIN ng mga digit na 0-9 lang"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Hindi pinapayagan ng administrator ng device ang paggamit ng kamakailang PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Naglalaman ang password ng ilegal na character"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Uri ng APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Tanggalin ang APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Bagong APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"I-save"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Maaaring tumagal ang pagkonekta nang ilang minuto..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa setup."\n\n"Pindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang network ng Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Mga setting ng pag-sync"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Kasalukuyang nakakaranas ng mga problema ang pag-sync. Babalik ito sa ilang saglit."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Magdagdag ng account"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Pangkalahatan setting pag-sync"</string>
     <string name="background_data" msgid="5779592891375473817">"Data sa background"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Kaya mag-sync, padala, at tanggap data ang app. anuman oras"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Bigyang-pansin"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Pinapalawak ng hindi pagpapagana sa data ng background ang buhay ng baterya at pinapababa ang paggamit ng data. Maaari pa ring gamitin ng ilang application ang koneksyon ng data sa background."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Awtomatikong pag-sync"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Awtomatikong sini-sync ng mga application ang data"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Pamahalaan ang mga account"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"NAKA-ON ang pag-sync"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Error sa pag-sync"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Mga setting ng back up"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"I-back up ang aking mga setting"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"I-sync ngayon"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Kanselahin ang pag-sync"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Galawin upang mag-sync ngayon<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendaryo"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Mga Contact"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Maligayang pagdating sa Google sync!"</font>" "\n"Isang paraan ng Google sa pag-synchronize ng data upang payagan ang access sa iyong mga contact, appointment, at higit pa kahit nasaan ka man."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Mga setting ng pag-sync ng application"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data at pag-synchronize"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index c4a1584..717cdd0 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 Dakika"</item>
+    <item msgid="5780349442819375570">"5 Dakika"</item>
+    <item msgid="1166466894270177580">"1 Saat"</item>
+    <item msgid="9032073376232198148">"Hiçbir zaman"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Yetersiz"</item>
     <item msgid="5615082285463430971">"Yeterli"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Yok"</item>
-    <item msgid="6267482274276126058">"Statik"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Statik"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Kapalı"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP veya CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Dahili cihaz depolaması"</item>
     <item msgid="3738430123799803530">"Çıkarılabilir SD kart"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bca57b9..e44abb3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Keşfedilebilir"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> saniye için keşfedilebilir…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Keşfedilebilir"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Cihazı keşfedilebilir yap"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Keşfedilebilirlik için zaman aşımı"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Cihazın ne süreyle keşfedilebilir olacağını ayarla"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sesli aramayı kilitle"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ekran kilitliyken blutooth çeviricinin kullanımını engelle"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth cihazlar"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Bir uygulama, Bluetooth\'u açmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Tabletinizdeki bir uygulama tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Telefonunuzdaki bir uygulama telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Tabletinizdeki bir uygulama, tabletinizi diğer Bluetooth cihazları tarafından \"her zaman keşfedilebilir\" yapmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Telefonunuzdaki bir uygulama, telefonunuzu diğer Bluetooth cihazları tarafından \"her zaman keşfedilebilir\" yapmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Tabletinizdeki bir uygulama, <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca Bluetooth\'u açmak ve tabletinizi diğer cihazlar tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Telefonunuzdaki bir uygulama, <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca Bluetooth\'u açmak ve telefonunuzu diğer cihazlar tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Tabletinizdeki bir uygulama, Bluetooth\'u açmak ve tabletinizi diğer cihazlar tarafından keşfedilebilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak ve telefonunuzu diğer cihazlar tarafından keşfedilebilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth açılıyor..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Otomatik bağlan"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tarih ve saat ayarları"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy ayarları"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Genel HTTP proxy\'sini ve dışlama listelerini ayarla"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Temizle"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Bağlantı Noktası"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Bağlantı Noktası"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Proxy\'si olmayanlar:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Varsayılanları geri yükle"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Bitti"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Ana makine adı"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Ana makine adı"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Dikkat"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Tamam"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Yazdığınız ana makine adı geçersiz."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Bağlantı noktası alanını tamamlamalısınız."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Girdiğiniz bağlantı noktası geçersiz."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Veri giriş denemeleri:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Ekr kilidini açmak için sayısal PIN gerektir"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Şifre"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Ekranın kilidini açmak için şifre gerektir"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Cihazın uzaktn yöntcs tarfndn devre dş bırkld"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Cihazın uzaktn yöntcs tarfndn devre dş bırkld"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Kapalı"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Güvenlik yok"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Desenle güvenlik etkin"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN, en az %d karakter olmalıdır"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"İşlem tamamlandığında Devam düğmesine basın"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Devam Et"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN, en fazla %d rakamdan oluşabilir"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN, en fazla %d rakamdan oluşabilir"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN yalnızca 0-9 arasındaki rakamları içermelidir"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Cihaz yöneticisi yakında kullanılmış PIN\'e izin vermiyor"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Şifre geçersiz bir karakter içeriyor"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP veya CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN türü"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN\'yi sil"</string>
     <string name="menu_new" msgid="3014205883303921729">"Yeni APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Kaydet"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index e8a890f..8ba5e34 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 хвилини"</item>
+    <item msgid="5780349442819375570">"5 хвилин"</item>
+    <item msgid="1166466894270177580">"1 година"</item>
+    <item msgid="9032073376232198148">"Ніколи"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабкий"</item>
     <item msgid="5615082285463430971">"Задов."</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Немає"</item>
-    <item msgid="6267482274276126058">"Статичні"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Статичні"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Вимк."</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP або CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Внутрішня пам\'ять пристрою"</item>
     <item msgid="3738430123799803530">"Знімна карта SD"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6b56f54..68e17a3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимий"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Видимий протягом <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> сек..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Видимий"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Зробити пристрій видимим"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Час видимості пристрою вийшов"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Налаштуйте час видимості пристрою"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблок. голос. набір"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Запобігає використанню набору bluetooth, коли екран заблоковано"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Пристрої Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Програма просить дозволу на ввімкнення Bluetooth. Зробити це?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Програма у вашому пристрої просить дозволу на надання пристрою видимості іншими пристроями з Bluetooth протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Програма у вашому телефоні просить дозволу на надання телефону видимості іншими пристроями Bluetooth протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Програма у вашому пристрої просить дозволу на надання пристрою \"постійної видимості\" іншими пристроями з Bluetooth. Зробити це?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Програма у вашому телефоні просить дозволу на надання телефону \"постійної видимості\" іншими пристроями з Bluetooth. Зробити це?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Програма у вашому пристрої просить дозволу на ввімкнення Bluetooth і надання пристрою видимості іншими пристроями протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Програма у вашому телефоні просить дозволу на ввімкнення Bluetooth та надання телефону видимості іншими пристроями протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Програма у вашому пристрої просить дозволу на ввімкнення Bluetooth і надання пристрою видимості іншими пристроями. Зробити це?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Програма у вашому телефоні просить дозволу на ввімкнення Bluetooth і надання телефону видимості іншими пристроями. Зробити це?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Увімкнення Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Автоматичне з\'єднання"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Налаштування дати та часу"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Налаштування проксі-сервера"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Устан. глоб. проксі-сервер HTTP й списки виключ."</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Очистити"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Порт"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Нема проксі для"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Відн. станд. знач."</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Готово"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Ім\'я хосту"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Ім\'я хосту"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Увага"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Введене ім\'я хосту недійсне."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Треба заповнити поле порту."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поле порту має бути порожнім, якщо поле хосту порожнє."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Введений порт недійсний."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Місцезнах.:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Сусідній CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спроб даних:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Для розблок. екрана потрібен цифровий PIN-код"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Для розблокування екрана потрібен пароль"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Вимкнено адміністратором віддал. пристрою"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Вимкнено адміністратором віддал. пристрою"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Вимк."</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Захист знято"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Захищено шаблоном"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-код має скл. з мінімум %d симв."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"По заверш. торк. \"Продовж.\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продовжити"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN не може бути довшим, ніж %d цифри"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN не може бути довшим, ніж %d цифри"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN має містити лише цифри 0–9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Адмін. пристрою не дозволяє використ. останній PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Пароль містить заборонений символ"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP або CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Тип APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Видалити APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Нова APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Зберег."</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Підключення може зайняти кілька хвилин..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування."\n\n"Торкніться опції "<b>"Назад"</b>", щоб з\'єднатися з іншою мережею Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Налаштування синхронізації"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Наразі виникли проблеми із синхронізацією. Незабаром вона відновиться."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Додати облік. запис"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Загальні налашт-ня синхроніз."</string>
     <string name="background_data" msgid="5779592891375473817">"Фонові дані"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Програми можуть будь-коли синхроніз., надсил. й отрим. дані"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Увага"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Вимкнення фонових даних продовжує час роботи батареї та зменшує використання даних. Деякі програми все ще можуть використовувати передавання фонових даних."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Авто-синхронізація"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Програми автоматично синхронізують дані"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Керування обліковими записами"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Синхроніз. ВВІМКНЕНО"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Помилка синхр-ції"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Налаштування резервного копіювання"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Створити резервну копію налаштувань"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронізувати зараз"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Скасувати синхронізацію"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Торкніться для синхронізації зараз<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Вітаємо в Google Sync!"</font>" "\n"Підхід Google до синхронізації даних для надання доступу до ваших контактів, подій та іншого з будь-якого місця, де ви перебуваєте."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Налаштування синхронізації програми"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Дані та синхронізація"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 5c5b84a..f0be8da 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 Phút"</item>
+    <item msgid="5780349442819375570">"5 Phút"</item>
+    <item msgid="1166466894270177580">"1 Giờ"</item>
+    <item msgid="9032073376232198148">"Không bao giờ"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Kém"</item>
     <item msgid="5615082285463430971">"Tốt"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Không chọn"</item>
-    <item msgid="6267482274276126058">"Tĩnh"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Tĩnh"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Tắt"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP hoặc CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Bộ nhớ trong của thiết bị"</item>
     <item msgid="3738430123799803530">"Thẻ SD tháo lắp được"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7f7995d..1015c68 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Có thể phát hiện"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Có thể phát hiện trong <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> giây…"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Có thể phát hiện"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Đặt thiết bị ở chế độ có thể phát hiện"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Thời gian chờ phát hiện"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Đặt thời gian thiết bị có thể phát hiện được"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Khoá quay số bằng giọng nói"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ngăn việc sử dụng trình quay số bluetooth khi màn hình bị khoá."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Thiết bị Bluetooth"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Ứng dụng đang yêu cầu quyền bật Bluetooth. Bạn có muốn thực hiện thao tác này không?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Ứng dụng trên máy tính bảng của bạn đang yêu cầu quyền đặt máy tính bảng của bạn ở chế độ có thể phát hiện bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Ứng dụng trên điện thoại của bạn đang yêu cầu quyền đặt điện thoại của bạn ở chế độ có thể phát hiện bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Một ứng dụng trên máy tính bảng của bạn đang yêu cầu cho phép đặt máy tính bảng của bạn ở chế độ “luôn có thể phát hiện được” bởi các thiết bị Bluetooth khác. Bạn có muốn thực hiện điều này không?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Một ứng dụng trên điện thoại của bạn đang yêu cầu cho phép đặt điện thoại của bạn ở chế độ “luôn có thể phát hiện được” bởi các thiết bị Bluetooth khác. Bạn có muốn thực hiện điều này không?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Ứng dụng trên máy tính bảng của bạn đang yêu cầu quyền bật Bluetooth và đặt máy tính bảng của bạn ở chế độ có thể phát hiện bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Ứng dụng trên điện thoại của bạn đang yêu cầu quyền bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Một ứng dụng trên máy tính bảng của bạn đang yêu cầu cho phép bật Bluetooth và đặt máy tính bảng của bạn ở chế độ có thể phát hiện được bởi các thiết bị. Bạn có muốn thực hiện điều này không?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Một ứng dụng trên điện thoại của bạn đang yêu cầu cho phép bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác. Bạn có muốn thực hiện điều này không?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Đang bật Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Kết nối tự động"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Cài đặt ngày &amp; giờ"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Cài đặt proxy"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"Đặt proxy HTTP chung và danh sách loại trừ"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Xoá"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Cổng"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Cổng"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Không có proxy cho"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Khôi phục mặc định"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Xong"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Tên máy chủ lưu trữ"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Tên máy chủ lưu trữ"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Chú ý"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Tên máy chủ lưu trữ bạn nhập không hợp lệ."</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Bạn phải hoàn tất trường cổng."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Trường cổng phải trống nếu trường máy chủ lưu trữ trống."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Cổng bạn nhập không hợp lệ."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vị trí:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID lân cận:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Nỗ lực dữ liệu:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Yêu cầu PIN số để mở khóa màn hình"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mật khẩu"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Yêu cầu mật khẩu để mở khóa màn hình"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Bị vô hiệu hóa bởi quản trị viên điện thoại từ xa"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Bị vô hiệu hóa bởi quản trị viên điện thoại từ xa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Tắt"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Không bảo mật"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Được bảo mật bằng hình"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Mã PIN phải có ít nhất %d ký tự"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Chạm vào Tiếp tục khi hoàn tất"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tiếp tục"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Mã PIN không được dài hơn %d chữ số"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Mã PIN không được dài hơn %d chữ số"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Mã PIN chỉ được chứa các chữ số 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Quản trị viên thiết bị không cho phép sử dụng PIN hiện tại"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Mật khẩu chứa ký tự không hợp lệ"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP hoặc CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Loại APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Xoá APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN mới"</string>
     <string name="menu_save" msgid="8109345640668285399">"Lưu"</string>
@@ -1360,14 +1373,16 @@
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Kết nối có thể mất vài phút..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Chạm "<b>"Tiếp theo"</b>" để tiếp tục cài đặt."\n\n"Chạm "<b>"Trở lại"</b>" để kết nối mạng Wi-Fi khác."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Đồng bộ hóa cài đặt"</string>
-    <!-- outdated translation 7257854052606796327 -->     <string name="sync_is_failing" msgid="1591561768344128377">"Đồng bộ hóa hiện đang gặp sự cố. Đồng bộ hóa sẽ sớm hoạt động trở lại."</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
     <string name="add_account_label" msgid="7811707265834013767">"Thêm tài khoản"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Cài đặt đồng bộ hóa chung"</string>
     <string name="background_data" msgid="5779592891375473817">"Dữ liệu nền"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Ứng dụng có thể đồng bộ hóa, gửi và nhận dữ liệu bất kỳ lúc nào"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Chú ý"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Vô hiệu hóa dữ liệu nền sẽ kéo dài tuổi thọ pin và giảm việc sử dụng dữ liệu. Một số ứng dụng vẫn có thể sử dụng kết nối dữ liệu nền."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Tự động đồng bộ hóa"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Ứng dụng tự động đồng bộ hóa dữ liệu"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Quản lý tài khoản"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Đồng bộ hóa BẬT"</string>
@@ -1375,13 +1390,18 @@
     <string name="sync_error" msgid="5060969083117872149">"Lỗi đồng bộ hóa"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Sao lưu cài đặt"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Sao lưu cài đặt của tôi"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Đồng bộ hóa ngay bây giờ"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Hủy đồng bộ hóa"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Chạm để đồng bộ hóa ngay bây giờ<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Lịch"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Danh bạ"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Chào mừng bạn đến với Google sync!"</font>" "\n"Một giải pháp đồng bộ hóa dữ liệu của Google cho phép quyền truy cập vào danh bạ, các cuộc hẹn và hơn thế nữa cho dù bạn ở đâu."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Cài đặt đồng bộ hóa ứng dụng"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dữ liệu &amp; đồng bộ hóa"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 90072e3..65f526e 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 分钟"</item>
+    <item msgid="5780349442819375570">"5 分钟"</item>
+    <item msgid="1166466894270177580">"1 小时"</item>
+    <item msgid="9032073376232198148">"从不"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"弱"</item>
     <item msgid="5615082285463430971">"一般"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"无"</item>
-    <item msgid="6267482274276126058">"静态"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"静态"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"关"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP 或 CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"设备内部存储"</item>
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2d1317e..5899fcc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可检测性"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可检测到..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"可检测到"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"可以检测到设备"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"可检测到设备的时间超时"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"设置可检测到设备的时间"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"锁定语音拨号"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"屏幕锁定时停止使用蓝牙拨号器"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"蓝牙设备"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"某一应用程序正在请求相应权限,以便打开蓝牙。要授予该权限吗?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"您平板电脑上的某一应用程序正在请求相应权限,以便让其他蓝牙设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。要授予该权限吗?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙,从而使其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。是否要授予这种权限?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"平板电脑上的某一应用程序正在请求相应权限,以便让其他蓝牙设备“一直可检测到”您的平板电脑。要授予该权限吗?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"手机上的某一应用程序正在请求相应权限,以便让其他蓝牙设备“一直可检测到”您的手机。要授予该权限吗?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"您平板电脑上的某一应用程序正在请求相应权限,以便打开蓝牙,从而让其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。要授予该权限吗?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙,从而使其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。是否要授予这种权限?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"平板电脑上的某一应用程序正在请求相应权限以便打开蓝牙,从而让其他设备可检测到您的平板电脑。要授予该权限吗?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"手机上的某一应用程序正在请求相应权限以便打开蓝牙,从而让其他设备可检测到您的手机。要授予该权限吗?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在打开蓝牙…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"自动连接"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"代理设置"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"设置全局 HTTP 代理和排除列表"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"端口"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"端口"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"以下对象没有代理:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"恢复默认设置"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"完成"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"主机名"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"主机名"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"确定"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"您输入的主机名无效。"</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必须填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空,则端口字段必须为空。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"您输入的端口无效。"</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"地点:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相邻的 CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"数据尝试次数:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"需要数字 PIN 才能解锁屏幕"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"需要密码才能解锁屏幕"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"已由远程设备管理员停用"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"已由远程设备管理员停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"关闭"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"不设置安全保护"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"使用图案设置安全保护"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必须至少包含 %d 个字符"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"完成后触摸“继续”"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"继续"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN 不得超过 %d 位数"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN 不得超过 %d 位数"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN 只能由 0-9 的数字组成"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"设备管理员不允许使用最近的 PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"密码包含非法字符"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP 或 CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN 类型"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"删除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新建 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"保存"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index b65d32e..a49c50f 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -116,6 +116,12 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 分鐘"</item>
+    <item msgid="5780349442819375570">"5 分鐘"</item>
+    <item msgid="1166466894270177580">"1 小時"</item>
+    <item msgid="9032073376232198148">"永不"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"差"</item>
     <item msgid="5615082285463430971">"可"</item>
@@ -161,7 +167,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"無"</item>
-    <item msgid="6267482274276126058">"靜態"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"靜態"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"關閉"</item>
@@ -174,6 +180,9 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP 或 CHAP"</item>
   </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"內部裝置儲存空間"</item>
     <item msgid="3738430123799803530">"卸除式 SD 卡"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 68506b1..51a0f3d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -91,7 +91,10 @@
     <string name="bluetooth" msgid="5549625000628014477">"藍牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可偵測性"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"可供偵測 <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒..."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"可供偵測"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"設定裝置為可偵測"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"可供偵測逾時時間"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"設定裝置可供偵測的開放時間"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"鎖定語音撥號"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"螢幕鎖定時不要使用藍芽撥號"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"藍牙裝置"</string>
@@ -119,8 +122,12 @@
     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"某個應用程式要求開啟藍牙功能,您想要允許要求嗎?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋,開放的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。您想要允許這項要求嗎?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"手機上的某個應用程式要求開啟藍牙裝置,這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"平板電腦上的某個應用程式要求將平板電腦設成「永遠」開放其他藍牙裝置搜尋。您想要允許這項要求嗎?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"手機上的某個應用程式要求將手機設成「永遠」開放其他藍牙裝置搜尋。您想要允許這項要求嗎?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"平板電腦上的某個應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他藍牙裝置在這段時間內可以搜尋到您的平板電腦。您想要允許這項要求嗎?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"手機上的某個應用程式要求開啟藍牙裝置,這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"平板電腦上的某個應用程式要求開啟藍牙功能,讓其他藍牙裝置可以搜尋到您的平板電腦。您想要允許這項要求嗎?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"手機上的某個應用程式要求開啟藍牙功能,讓其他藍牙裝置可以搜尋到您的手機。您想要允許這項要求嗎?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在開啟藍牙..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"自動連線"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期與時間設定"</string>
@@ -140,11 +147,11 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy 設定"</string>
     <string name="proxy_settings_summary" msgid="7898928000758321486">"設定全域 HTTP Proxy 和排除清單"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"連接埠"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"連接埠"</string>
     <string name="proxy_exclusionlist_label" msgid="204409815790850313">"排除以下網域的 Proxy:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"還原預設值"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"完成"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"主機名稱"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"主機名稱"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"確定"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"您輸入的主機名稱無效。"</string>
@@ -152,6 +159,8 @@
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必須輸入連接埠欄位。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"若主機欄位空白,連接埠欄位也須空白。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"您輸入的連接埠無效。"</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"嘗試資料:"</string>
@@ -308,7 +317,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"需輸入數字 PIN 替螢幕解鎖"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密碼"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"需輸入密碼替螢幕解鎖"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"已由遠端裝置管理員停用"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"已由遠端裝置管理員停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"關閉"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"不設安全保護"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"以解鎖圖形設定安全保護"</string>
@@ -325,8 +334,10 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必須有至少 %d 個字元"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"完成時請輕觸 [繼續]"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN 不得超過 %d 位數"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN 不得超過 %d 位數"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN 只能包含數字 0-9"</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"裝置管理員不允許最近用過的 PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"密碼包含不適用的字元"</string>
@@ -706,6 +717,8 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP 或 CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN 類型"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"刪除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新增 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"儲存"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3ef465a..4f9eadd 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -280,6 +280,8 @@
     <string-array name="wifi_ap_security" translatable="false">
         <item>Open</item>
         <!-- Do not translate. -->
+        <item>WPA PSK</item>
+        <!-- Do not translate. -->
         <item>WPA2 PSK</item>
     </string-array>
 
@@ -294,6 +296,24 @@
         <item>TTLS</item>
     </string-array>
 
+    <!-- Bluetooth Settings -->
+
+    <!-- Discoverable mode timeout options -->
+    <string-array name="bluetooth_visibility_timeout_entries">
+        <item>2 Minutes</item>
+        <item>5 Minutes</item>
+        <item>1 Hour</item>
+        <item>Never</item>
+    </string-array>
+
+    <!-- Values for visibility_duration_entries matching constants in BluetoothSettings. Do not translate. -->
+    <string-array name="bluetooth_visibility_timeout_values" translatable="false">
+        <item>twomin</item>
+        <item>fivemin</item>
+        <item>onehour</item>
+        <item>never</item>
+    </string-array>
+
     <!-- Match this with drawable.wifi_signal. --> <skip />
     <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
     <string-array name="wifi_signal">
@@ -396,8 +416,8 @@
     <string-array name="wifi_proxy_settings">
         <!-- No HTTP proxy is used for the current wifi network [CHAR LIMIT=25] -->
         <item>None</item>
-        <!-- Static HTTP proxy settings are used for the current wifi network [CHAR LIMIT=25] -->
-        <item>Static</item>
+        <!-- Manual HTTP proxy settings are used for the current wifi network [CHAR LIMIT=25] -->
+        <item>Manual</item>
     </string-array>
 
     <!-- Sound settings for emergency tone. -->
@@ -446,6 +466,22 @@
         <item>3</item>
     </string-array>
 
+    <!-- Authentication Types used in APN editor -->
+    <string-array name="apn_protocol_entries">
+        <item>IPv4</item>
+        <item>IPv6</item>
+        <item>IPv4/IPv6</item>
+    </string-array>
+
+    <string-array translatable="false" name="apn_protocol_values">
+        <!-- Do not translate. -->
+        <item>IP</item>
+        <!-- Do not translate. -->
+        <item>IPV6</item>
+        <!-- Do not translate. -->
+        <item>IPV4V6</item>
+    </string-array>
+
     <!-- Apps on SD instalaltion location options in ApplicationSettings -->
     <string-array name="app_install_location_entries">
         <item>Internal device storage</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0b8beb6..715a679 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,9 +19,12 @@
     <color name="red">#F00</color>
 
     <color name="memory_avail">#333</color>
-    <color name="memory_media_usage">#F33</color>
-    <color name="memory_apps_usage">#3F3</color>
-    <color name="memory_used">#FFF</color>
+    <color name="memory_apps_usage">#FFF</color>
+    <color name="memory_used">#F00</color>
+    <color name="memory_downloads">#F00</color>
+    <color name="memory_video">#0F0</color>
+    <color name="memory_audio">#00F</color>
+    <color name="memory_misc">#FF0</color>
     
     <color name="crypt_keeper_clock_background">#ff9a9a9a</color>
     <color name="crypt_keeper_clock_foreground">#ff666666</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 80a4a37..5d2aa33 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -18,4 +18,5 @@
     <dimen name="vpn_connect_margin_right">10sp</dimen>
     <dimen name="vpn_connect_normal_text_size">16sp</dimen>
     <dimen name="vpn_connect_input_box_label_width">90sp</dimen>
+    <dimen name="device_memory_usage_button_size">32dip</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 131fe6b..39aa0cc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -183,9 +183,14 @@
     <string name="bluetooth_visibility">Discoverable</string>
     <!-- Bluetooth settings screen, summary after selecting Discoverable check box -->
     <string name="bluetooth_is_discoverable">Discoverable for <xliff:g id="discoverable_time_period">%1$s</xliff:g> seconds\u2026</string>
+    <!-- Bluetooth settings screen, Discoverable checkbox summary text when Discoverable duration is set to "forever" -->
+    <string name="bluetooth_is_discoverable_always">Discoverable</string>
     <!-- Bluetooth settings screen, Discoverable checkbox summary text -->
     <string name="bluetooth_not_discoverable">Make device discoverable</string>
-    <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
+    <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
+    <string name="bluetooth_visibility_timeout">Discoverable timeout</string>
+    <!-- Bluetooth settings screen, Discoverable timout list dialog summary text -->
+    <string name="bluetooth_visibility_timeout_summary">Set how long device will be discoverable</string>
     <!-- Bluetooth settings screen, check box label whether or not to allow
         bluetooth voice dialing when lock screen is up-->
     <string name="bluetooth_lock_voice_dialing">Lock voice dialing</string>
@@ -193,7 +198,7 @@
     <string name="bluetooth_lock_voice_dialing_summary">
       Prevent use of the bluetooth dialer when the screen is locked
     </string>
-
+    <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
     <string name="bluetooth_devices">Bluetooth devices</string>
     <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
     <string name="bluetooth_device_name">Device name</string>
@@ -248,11 +253,19 @@
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
     <string name="bluetooth_ask_discovery" product="default">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
 
+    <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
+    <string name="bluetooth_ask_lasting_discovery" product="tablet">"An application on your tablet is requesting permission to make your tablet \u201calways discoverable\u201d by other Bluetooth devices. Do you want to do this?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default">"An application on your phone is requesting permission to make your phone \u201calways discoverable\u201d by other Bluetooth devices. Do you want to do this?"</string>
+
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet">"An application on your tablet is requesting permission to turn on Bluetooth and to make your tablet discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
     <string name="bluetooth_ask_enablement_and_discovery" product="default">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
 
+    <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet">"An application on your tablet is requesting permission to turn on Bluetooth and to make your tablet discoverable by other devices. Do you want to do this?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices. Do you want to do this?"</string>
+
     <!-- Strings for msg to display to user while bluetooth is turning on -->
     <string name="bluetooth_turning_on">"Turning on Bluetooth\u2026"</string>
 
@@ -299,7 +312,7 @@
     <!-- HTTP proxy settings. Button to clear the proxy box. -->
     <string name="proxy_clear_text">Clear</string>
     <!-- HTTP proxy settings. The port number label. -->
-    <string name="proxy_port_label">Port</string>
+    <string name="proxy_port_label">Proxy port</string>
     <!-- HTTP proxy settings. The exclusion list label. -->
     <string name="proxy_exclusionlist_label">No Proxy for</string>
     <!-- HTTP proxy settings. The button to restore the defaults. -->
@@ -307,7 +320,7 @@
     <!-- HTTP proxy settings. The button to save. -->
     <string name="proxy_action_text">Done</string>
     <!-- HTTP proxy settings. The text field for the hostname -->
-    <string name="proxy_hostname_label">Hostname</string>
+    <string name="proxy_hostname_label">Proxy hostname</string>
     <!-- HTTP proxy settings. Title if there is an error-->
     <string name="proxy_error">Attention</string>
     <!-- HTTP proxy settings. Button to get rid of error box-->
@@ -322,6 +335,8 @@
     <string name="proxy_error_empty_host_set_port">The port field must be empty if the host field is empty.</string>
     <!-- HTTP proxy settings. Error msg -->
     <string name="proxy_error_invalid_port">The port you typed is not valid.</string>
+    <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+    <string name="proxy_warning_limited_support">The HTTP proxy is used by the browser but may not be used by the other applications</string>
 
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_signal_location_label">Location:</string>
@@ -451,7 +466,7 @@
     <!-- The title of the activity to see battery info. -->
     <string name="battery_info_label">Battery info</string>
     <!-- The title of the activity to adjust display settings -->
-    <string name="display_label">Display</string>
+    <string name="display_label">Screen</string>
     <!-- The title of the activity to see phone info -->
     <string name="phone_info_label" product="tablet">Tablet info</string>
     <!-- The title of the activity to see phone info -->
@@ -723,8 +738,8 @@
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_password_summary">Require a password to unlock the screen</string>
 
-    <!-- Summary for preference that has been disabled by DevicePolicyAdmin [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_disabled_summary">Disabled by remote device administrator</string>
+    <!-- Summary for preference that has been disabled by DevicePolicyAdmin [CHAR LIMIT=50] -->
+    <string name="unlock_set_unlock_disabled_summary">Disabled by administrator or encryption policy</string>
 
     <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_off">Off</string>
@@ -766,9 +781,9 @@
     <string name="lockpassword_continue_label">Continue</string>
 
     <!-- Error shown in popup when password is too long -->
-    <string name="lockpassword_password_too_long">PIN can be no longer than %d digits</string>
+    <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters</string>
     <!-- Error shown in popup when PIN is too long -->
-    <string name="lockpassword_pin_too_long">PIN can be no longer than %d digits</string>
+    <string name="lockpassword_pin_too_long">PIN must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits</string>
 
     <!-- Error shown when in PIN mode and user enters a non-digit -->
     <string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9</string>
@@ -1390,7 +1405,7 @@
 
     <!-- Display settings -->
     <!-- Sound & display settings screen, section header for settings related to display -->
-    <string name="display_settings">Display settings</string>
+    <string name="display_settings">Screen settings</string>
     <!-- Sound & display settings screen, animations check box label -->
     <string name="animations_title">Animation</string>
     <!-- Sound & display settings screen, animations option summary text when check box is selected -->
@@ -1551,10 +1566,18 @@
     <string name="memory_size">Total</string>
     <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
     <string name="memory_calculating_size">Calculating…</string>
-    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=30] -->
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_apps_usage">Applications</string>
-    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=30] -->
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_media_usage">Media</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_downloads_usage">Downloads</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_dcim_usage">Pictures, Videos</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_music_usage">Audio (music, ringtones, podcasts etc)</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_media_misc_usage">Misc.</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
     <string name="sd_eject" product="nosdcard">Unmount shared storage</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
@@ -1664,6 +1687,8 @@
     <string name="apn_auth_type_pap_chap">PAP or CHAP</string>
     <!-- Edit access point labels: The type of APN -->
     <string name="apn_type">APN type</string>
+    <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+    <string name="apn_protocol">APN protocol</string>
     <!-- Edit access point screen menu option to delete this APN -->
     <string name="menu_delete">Delete APN</string>
     <!-- APNs screen menu option to create a brand spanking new APN -->
@@ -2404,9 +2429,9 @@
     <!-- Summary for on-screen keyboard settings -->
     <string name="onscreen_keyboard_settings_summary">Onscreen keyboard settings</string>
     <!-- Title for built-in keyboard settings -->
-    <string name="builtin_keyboard_settings_title">Built-in keyboard</string>
+    <string name="builtin_keyboard_settings_title">Physical keyboard</string>
     <!-- Summary for built-in keyboard settings -->
-    <string name="builtin_keyboard_settings_summary">Built-in, physical keyboard settings</string>
+    <string name="builtin_keyboard_settings_summary">Physical keyboard settings</string>
 
     <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
     <string name="development_settings_title">Development</string>
@@ -2576,7 +2601,7 @@
     <string name="packages_subtitle">Included packages</string>
 
     <!-- Label for power consumed by the screen -->
-    <string name="power_screen">Display</string>
+    <string name="power_screen">Screen</string>
     <!-- Label for power consumed by WiFi -->
     <string name="power_wifi">Wi-Fi</string>
     <!-- Label for power consumed by Bluetooth -->
@@ -2623,7 +2648,7 @@
     <!-- Label for app settings action -->
     <string name="battery_action_app_settings">Application settings</string>
     <!-- Label for display settings -->
-    <string name="battery_action_display">Display settings</string>
+    <string name="battery_action_display">Screen settings</string>
     <!-- Label for wifi settings -->
     <string name="battery_action_wifi">Wi-Fi settings</string>
     <!-- Label for bluetooth settings -->
@@ -2931,11 +2956,11 @@
     <!-- Summary of preference to enable/dislable access to credential storage [CHAR LIMIT=NONE] -->
     <string name="credentials_access_summary">Allow applications to access secure certificates and other credentials</string>
     <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
-    <string name="credentials_install" product="nosdcard">Install from USB storage</string>
+    <string name="credentials_install" product="nosdcard">Install from storage</string>
     <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
     <string name="credentials_install" product="default">Install from SD card</string>
     <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
-    <string name="credentials_install_summary" product="nosdcard">Install certificates from USB storage</string>
+    <string name="credentials_install_summary" product="nosdcard">Install certificates from storage</string>
     <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
     <string name="credentials_install_summary" product="default">Install certificates from SD card</string>
     <!-- Title of preference to set the password for credential storage [CHAR LIMIT=30] -->
@@ -3240,4 +3265,15 @@
     <!-- This error message is displayed when the vpn profile is going to be saved but the vpn service is busy [CHAR LIMIT=NONE] -->
     <string name="service_busy">Service busy, try again</string>
 
+    <!-- the following are for Settings Storage screen -->
+    <!-- Menu item/button 'delete' -->
+    <string name="delete">Delete</string>
+    <!-- Misc files [CHAR LIMIT=25] -->
+    <string name="misc_files">Misc Files</string>
+    <!-- number of misc files selected [CHAR LIMIT=20] -->
+    <string name="misc_files_selected_count">selected</string>
+    <!-- the string 'out of' displayed when saying "selected N out of M" [CHAR LIMIT=20] -->
+    <string name="misc_files_selected_count_out_of">out of</string>
+    <!--  action to select all [CHAR LIMIT=30] -->
+    <string name="select_all">Select All</string>
 </resources>
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index 68a1b31..f000dd0 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -114,4 +114,11 @@
         android:singleLine="true"
         android:inputType="textNoSuggestions"
         />
+    <ListPreference
+        android:title="@string/apn_protocol"
+        android:dialogTitle="@string/apn_protocol"
+        android:key="apn_protocol"
+        android:entries="@array/apn_protocol_entries"
+        android:entryValues="@array/apn_protocol_values"
+        />
 </PreferenceScreen>   
diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml
index 64e6377..b441ab4 100644
--- a/res/xml/bluetooth_settings.xml
+++ b/res/xml/bluetooth_settings.xml
@@ -43,6 +43,14 @@
         android:summaryOff="@string/bluetooth_not_discoverable"
         android:persistent="false" />
 
+    <ListPreference
+        android:key="bt_discoverable_timeout"
+        android:title="@string/bluetooth_visibility_timeout"
+        android:dependency="bt_discoverable"
+        android:summary="@string/bluetooth_visibility_timeout_summary"
+        android:entries="@array/bluetooth_visibility_timeout_entries"
+        android:entryValues="@array/bluetooth_visibility_timeout_values" />
+
     <Preference
         android:key="bt_show_received_files"
         android:dependency="bt_checkbox"
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
index 368862a..b536d00 100644
--- a/res/xml/device_info_memory.xml
+++ b/res/xml/device_info_memory.xml
@@ -41,14 +41,29 @@
         <Preference android:key="memory_internal_size"
             android:title="@string/memory_size"
             android:summary="@string/memory_calculating_size"/>
-        <Preference android:key="memory_internal_media"
-            android:title="@string/memory_media_usage"
+
+        <Preference android:key="memory_internal_avail"
+            android:title="@string/memory_available"
             android:summary="@string/memory_calculating_size"/>
+
         <Preference android:key="memory_internal_apps"
             android:title="@string/memory_apps_usage"
             android:summary="@string/memory_calculating_size"/>
-        <Preference android:key="memory_internal_avail"
-            android:title="@string/memory_available"
+
+        <Preference android:key="memory_internal_downloads"
+            android:title="@string/memory_downloads_usage"
+            android:summary="@string/memory_calculating_size"/>
+
+        <Preference android:key="memory_internal_dcim"
+            android:title="@string/memory_dcim_usage"
+            android:summary="@string/memory_calculating_size"/>
+
+        <Preference android:key="memory_internal_music"
+            android:title="@string/memory_music_usage"
+            android:summary="@string/memory_calculating_size"/>
+
+        <Preference android:key="memory_internal_media_misc"
+            android:title="@string/memory_media_misc_usage"
             android:summary="@string/memory_calculating_size"/>
     </PreferenceCategory>
 
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 9328c14..f738823 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -48,6 +48,7 @@
 
     private final static String SAVED_POS = "pos";
     private final static String KEY_AUTH_TYPE = "auth_type";
+    private final static String KEY_PROTOCOL = "apn_protocol";
 
     private static final int MENU_DELETE = Menu.FIRST;
     private static final int MENU_SAVE = Menu.FIRST + 1;
@@ -69,6 +70,7 @@
     private EditTextPreference mMmsPort;
     private ListPreference mAuthType;
     private EditTextPreference mApnType;
+    private ListPreference mProtocol;
 
     private String mCurMnc;
     private String mCurMcc;
@@ -99,6 +101,7 @@
             Telephony.Carriers.MMSPORT, // 13
             Telephony.Carriers.AUTH_TYPE, // 14
             Telephony.Carriers.TYPE, // 15
+            Telephony.Carriers.PROTOCOL, // 16
     };
 
     private static final int ID_INDEX = 0;
@@ -116,6 +119,7 @@
     private static final int MMSPORT_INDEX = 13;
     private static final int AUTH_TYPE_INDEX = 14;
     private static final int TYPE_INDEX = 15;
+    private static final int PROTOCOL_INDEX = 16;
 
 
     @Override
@@ -139,9 +143,12 @@
         mMnc = (EditTextPreference) findPreference("apn_mnc");
         mApnType = (EditTextPreference) findPreference("apn_type");
 
-        mAuthType = (ListPreference) findPreference("auth_type");
+        mAuthType = (ListPreference) findPreference(KEY_AUTH_TYPE);
         mAuthType.setOnPreferenceChangeListener(this);
 
+        mProtocol = (ListPreference) findPreference(KEY_PROTOCOL);
+        mProtocol.setOnPreferenceChangeListener(this);
+
         mRes = getResources();
 
         final Intent intent = getIntent();
@@ -238,6 +245,7 @@
                 mAuthType.setValue(null);
             }
 
+            mProtocol.setValue(mCursor.getString(PROTOCOL_INDEX));
         }
 
         mName.setSummary(checkNull(mName.getText()));
@@ -264,6 +272,28 @@
         } else {
             mAuthType.setSummary(sNotSet);
         }
+
+        mProtocol.setSummary(
+                checkNull(protocolDescription(mProtocol.getValue())));
+    }
+
+    /**
+     * Returns the UI choice (e.g., "IPv4/IPv6") corresponding to the given
+     * raw value of the protocol preference (e.g., "IPV4V6"). If unknown,
+     * return null.
+     */
+    private String protocolDescription(String raw) {
+        int protocolIndex = mProtocol.findIndexOfValue(raw);
+        if (protocolIndex == -1) {
+            return null;
+        } else {
+            String[] values = mRes.getStringArray(R.array.apn_protocol_entries);
+            try {
+                return values[protocolIndex];
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return null;
+            }
+        }
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -278,6 +308,16 @@
             } catch (NumberFormatException e) {
                 return false;
             }
+            return true;
+        }
+
+        if (KEY_PROTOCOL.equals(key)) {
+            String protocol = protocolDescription((String) newValue);
+            if (protocol == null) {
+                return false;
+            }
+            mProtocol.setSummary(protocol);
+            mProtocol.setValue((String) newValue);
         }
         return true;
     }
@@ -389,6 +429,8 @@
             values.put(Telephony.Carriers.AUTH_TYPE, Integer.parseInt(authVal));
         }
 
+        values.put(Telephony.Carriers.PROTOCOL, checkNotSet(mProtocol.getValue()));
+
         values.put(Telephony.Carriers.TYPE, checkNotSet(mApnType.getText()));
 
         values.put(Telephony.Carriers.MCC, mcc);
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 018dfd2..a0f2346 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -274,7 +274,7 @@
             if (password.length() > mPasswordMaxLength) {
                 return getString(mIsAlphaMode ?
                         R.string.lockpassword_password_too_long
-                        : R.string.lockpassword_pin_too_long, mPasswordMaxLength);
+                        : R.string.lockpassword_pin_too_long, mPasswordMaxLength + 1);
             }
             int letters = 0;
             int numbers = 0;
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 17d3de2..55f6254 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -248,7 +248,7 @@
                     LeftButtonMode.Retry, RightButtonMode.Continue, ID_EMPTY_MESSAGE, false),
             NeedToConfirm(
                     R.string.lockpattern_need_to_confirm,
-                    LeftButtonMode.CancelDisabled, RightButtonMode.ConfirmDisabled,
+                    LeftButtonMode.Cancel, RightButtonMode.ConfirmDisabled,
                     ID_EMPTY_MESSAGE, true),
             ConfirmWrong(
                     R.string.lockpattern_need_to_unlock_wrong,
diff --git a/src/com/android/settings/ChooseLockPatternTutorial.java b/src/com/android/settings/ChooseLockPatternTutorial.java
index 2e596df..4ad16fb 100644
--- a/src/com/android/settings/ChooseLockPatternTutorial.java
+++ b/src/com/android/settings/ChooseLockPatternTutorial.java
@@ -102,6 +102,7 @@
                 Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                 startActivity(intent);
+                getActivity().overridePendingTransition(0, 0); // no animation
                 getActivity().finish();
             }
         }
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 3d752a3..0374ba6 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -25,6 +25,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Rect;
 import android.inputmethodservice.KeyboardView;
 import android.os.Bundle;
 import android.os.Handler;
@@ -35,11 +36,14 @@
 import android.os.SystemProperties;
 import android.os.storage.IMountService;
 import android.text.TextUtils;
+import android.util.AttributeSet;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
@@ -80,6 +84,38 @@
         }
     }
 
+    // Use a custom EditText to prevent the input method from showing.
+    public static class CryptEditText extends EditText {
+        InputMethodManager imm;
+
+        public CryptEditText(Context context, AttributeSet attrs) {
+            super(context, attrs);
+            imm = ((InputMethodManager) getContext().
+                    getSystemService(Context.INPUT_METHOD_SERVICE));
+        }
+
+        @Override
+        protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+            super.onFocusChanged(focused, direction, previouslyFocusedRect);
+
+            if (focused && imm != null && imm.isActive(this)) {
+                imm.hideSoftInputFromWindow(getApplicationWindowToken(), 0);
+            }
+        }
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            boolean handled = super.onTouchEvent(event);
+
+            if (imm != null && imm.isActive(this)) {
+                imm.hideSoftInputFromWindow(getApplicationWindowToken(), 0);
+            }
+
+            return handled;
+        }
+    }
+
+
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index c3d3bfd..bfbb601 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -95,7 +95,7 @@
         mAutoTimeZoneButton.setText(autoTimeZoneEnabled ? R.string.zone_auto_summaryOn :
                 R.string.zone_auto_summaryOff);*/
 
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
 
         final TimeZone tz = TimeZone.getDefault();
         mSelectedTimeZone = tz;
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index beea51e..4f8b374 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -427,7 +427,7 @@
 
         if (-1 == signalDbm) signalDbm = 0;
 
-        int signalAsu = mPhoneStateReceiver.getSignalStrength();
+        int signalAsu = mPhoneStateReceiver.getSignalStrengthLevelAsu();
 
         if (-1 == signalAsu) signalAsu = 0;
 
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 085a089..4ccd598 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -86,12 +86,6 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.tether_prefs);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View view = super.onCreateView(inflater, container, savedInstanceState);
 
         final Activity activity = getActivity();
         mBluetoothPan = new BluetoothPan(activity);
@@ -109,17 +103,19 @@
         mWifiRegexs = cm.getTetherableWifiRegexs();
         mBluetoothRegexs = cm.getTetherableBluetoothRegexs();
 
-        boolean usbAvailable = mUsbRegexs.length != 0;
-        boolean wifiAvailable = mWifiRegexs.length != 0;
-        boolean bluetoothAvailable = mBluetoothRegexs.length != 0;
+        final boolean usbAvailable = mUsbRegexs.length != 0;
+        final boolean wifiAvailable = mWifiRegexs.length != 0;
+        final boolean bluetoothAvailable = mBluetoothRegexs.length != 0;
 
         if (!usbAvailable || Utils.isMonkeyRunning()) {
             getPreferenceScreen().removePreference(mUsbTether);
         }
+
         if (!wifiAvailable) {
             getPreferenceScreen().removePreference(mEnableWifiAp);
             getPreferenceScreen().removePreference(mWifiApSettings);
         }
+
         if (!bluetoothAvailable) {
             getPreferenceScreen().removePreference(mBluetoothTether);
         } else {
@@ -129,27 +125,9 @@
                 mBluetoothTether.setChecked(false);
             }
         }
-        /* Don't change the title for two-pane settings
-        if (wifiAvailable && usbAvailable && bluetoothAvailable){
-            activity.setTitle(R.string.tether_settings_title_all);
-        } else if (wifiAvailable && usbAvailable){
-            activity.setTitle(R.string.tether_settings_title_all);
-        } else if (wifiAvailable && bluetoothAvailable){
-            activity.setTitle(R.string.tether_settings_title_all);
-        } else if (wifiAvailable) {
-            activity.setTitle(R.string.tether_settings_title_wifi);
-        } else if (usbAvailable && bluetoothAvailable) {
-            activity.setTitle(R.string.tether_settings_title_usb_bluetooth);
-        } else if (usbAvailable) {
-            activity.setTitle(R.string.tether_settings_title_usb);
-        } else {
-            activity.setTitle(R.string.tether_settings_title_bluetooth);
-        }
-        */
+
         mWifiApEnabler = new WifiApEnabler(activity, mEnableWifiAp);
         mView = new WebView(activity);
-
-        return view;
     }
 
     @Override
diff --git a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
index b200eb6..4b9ca81 100644
--- a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
+++ b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
@@ -20,6 +20,7 @@
 
 import android.content.Context;
 import android.graphics.drawable.AnimationDrawable;
+import android.os.Handler;
 import android.preference.CheckBoxPreference;
 import android.util.AttributeSet;
 import android.view.View;
@@ -40,7 +41,7 @@
      * toggling whether the provider will do autosync.
      */
     private boolean mOneTimeSyncMode = false;
-    
+
     public SyncStateCheckBoxPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setWidgetLayoutResource(R.layout.preference_widget_sync_toggle);
@@ -67,7 +68,7 @@
         boolean showError;
         boolean showPending;
         if (mIsActive) {
-            syncActiveView.post(new Runnable() {
+            new Handler(getContext().getMainLooper()).post(new Runnable() {
                 public void run() {
                     anim.start();
                 }
@@ -87,11 +88,11 @@
 
         syncFailedView.setVisibility(showError ? View.VISIBLE : View.GONE);
         syncPendingView.setVisibility((showPending && !mIsActive) ? View.VISIBLE : View.GONE);
-        
+
         View checkBox = view.findViewById(android.R.id.checkbox);
         if (mOneTimeSyncMode) {
             checkBox.setVisibility(View.GONE);
-            
+
             /*
              * Override the summary. Fill in the %1$s with the existing summary
              * (what ends up happening is the old summary is shown on the next
@@ -138,7 +139,7 @@
         mOneTimeSyncMode = oneTimeSyncMode;
         notifyChanged();
     }
-    
+
     /**
      * Gets whether the preference is in one-time sync mode.
      */
@@ -152,7 +153,7 @@
         // checkbox state
         if (!mOneTimeSyncMode) {
             super.onClick();
-        }            
+        }
     }
 
     public Account getAccount() {
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 0168396..e56db74 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -5,11 +5,14 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageStatsObserver;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageStats;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Handler;
@@ -200,6 +203,7 @@
 
     // Information about all applications.  Synchronize on mAppEntries
     // to protect access to these.
+    final InterestingConfigChanges mInterestingConfigChanges = new InterestingConfigChanges();
     final HashMap<String, AppEntry> mEntriesMap = new HashMap<String, AppEntry>();
     final ArrayList<AppEntry> mAppEntries = new ArrayList<AppEntry>();
     List<ApplicationInfo> mApplications = new ArrayList<ApplicationInfo>();
@@ -376,9 +380,18 @@
             if (mApplications == null) {
                 mApplications = new ArrayList<ApplicationInfo>();
             }
-            for (int i=0; i<mAppEntries.size(); i++) {
-                mAppEntries.get(i).sizeStale = true;
+
+            if (mInterestingConfigChanges.applyNewConfig(mContext.getResources())) {
+                // If an interesting part of the configuration has changed, we
+                // should completely reload the app entries.
+                mEntriesMap.clear();
+                mAppEntries.clear();
+            } else {
+                for (int i=0; i<mAppEntries.size(); i++) {
+                    mAppEntries.get(i).sizeStale = true;
+                }
             }
+
             for (int i=0; i<mApplications.size(); i++) {
                 final ApplicationInfo info = mApplications.get(i);
                 final AppEntry entry = mEntriesMap.get(info.packageName);
diff --git a/src/com/android/settings/applications/InterestingConfigChanges.java b/src/com/android/settings/applications/InterestingConfigChanges.java
new file mode 100644
index 0000000..816d169
--- /dev/null
+++ b/src/com/android/settings/applications/InterestingConfigChanges.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+
+class InterestingConfigChanges {
+    final Configuration mLastConfiguration = new Configuration();
+    int mLastDensity;
+
+    boolean applyNewConfig(Resources res) {
+        int configChanges = mLastConfiguration.updateFrom(res.getConfiguration());
+        boolean densityChanged = mLastDensity != res.getDisplayMetrics().densityDpi;
+        if (densityChanged || (configChanges&(ActivityInfo.CONFIG_LOCALE
+                |ActivityInfo.CONFIG_UI_MODE|ActivityInfo.CONFIG_SCREEN_LAYOUT)) != 0) {
+            mLastDensity = res.getDisplayMetrics().densityDpi;
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index dbe4a64..e7e3af4 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -34,7 +34,6 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
-import android.os.SystemClock;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.util.SparseArray;
@@ -54,9 +53,10 @@
     static Object sGlobalLock = new Object();
     static RunningState sInstance;
 
-    static final int MSG_UPDATE_CONTENTS = 1;
-    static final int MSG_REFRESH_UI = 2;
-    static final int MSG_UPDATE_TIME = 3;
+    static final int MSG_RESET_CONTENTS = 1;
+    static final int MSG_UPDATE_CONTENTS = 2;
+    static final int MSG_REFRESH_UI = 3;
+    static final int MSG_UPDATE_TIME = 4;
 
     static final long TIME_UPDATE_DELAY = 1000;
     static final long CONTENTS_UPDATE_DELAY = 2000;
@@ -69,6 +69,8 @@
 
     OnRefreshUiListener mRefreshUiListener;
 
+    final InterestingConfigChanges mInterestingConfigChanges = new InterestingConfigChanges();
+
     // Processes that are hosting a service we are interested in, organized
     // by uid and name.  Note that this mapping does not change even across
     // service restarts, and during a restart there will still be a process
@@ -133,6 +135,9 @@
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
+                case MSG_RESET_CONTENTS:
+                    reset();
+                    break;
                 case MSG_UPDATE_CONTENTS:
                     synchronized (mLock) {
                         if (!mResumed) {
@@ -561,6 +566,12 @@
         synchronized (mLock) {
             mResumed = true;
             mRefreshUiListener = listener;
+            if (mInterestingConfigChanges.applyNewConfig(mApplicationContext.getResources())) {
+                mHaveData = false;
+                mBackgroundHandler.removeMessages(MSG_RESET_CONTENTS);
+                mBackgroundHandler.removeMessages(MSG_UPDATE_CONTENTS);
+                mBackgroundHandler.sendEmptyMessage(MSG_RESET_CONTENTS);
+            }
             if (!mBackgroundHandler.hasMessages(MSG_UPDATE_CONTENTS)) {
                 mBackgroundHandler.sendEmptyMessage(MSG_UPDATE_CONTENTS);
             }
@@ -613,6 +624,15 @@
         return false;
     }
 
+    private void reset() {
+        mServiceProcessesByName.clear();
+        mServiceProcessesByPid.clear();
+        mInterestingProcesses.clear();
+        mRunningProcesses.clear();
+        mProcessItems.clear();
+        mAllProcessItems.clear();
+    }
+
     private boolean update(Context context, ActivityManager am) {
         final PackageManager pm = context.getPackageManager();
         
@@ -975,7 +995,7 @@
         }
         
         if (newBackgroundItems == null) {
-            // One or more at the bottom may no longer exit.
+            // One or more at the bottom may no longer exist.
             if (mBackgroundItems.size() > numBackgroundProcesses) {
                 newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
                 for (int bgi=0; bgi<numBackgroundProcesses; bgi++) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index 37e48ff..166e4ae 100644
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -26,8 +26,11 @@
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.SystemProperties;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.CheckBoxPreference;
+import android.provider.Settings;
+import android.util.Log;
 
 /**
  * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
@@ -39,14 +42,26 @@
 
     private static final String SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT =
             "debug.bt.discoverable_time";
-    /* package */  static final int DEFAULT_DISCOVERABLE_TIMEOUT = 120;
 
-    /* package */ static final String SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP =
-            "discoverable_end_timestamp";
+    static final int DISCOVERABLE_TIMEOUT_TWO_MINUTES = 120;
+    static final int DISCOVERABLE_TIMEOUT_FIVE_MINUTES = 300;
+    static final int DISCOVERABLE_TIMEOUT_ONE_HOUR = 3600;
+    static final int DISCOVERABLE_TIMEOUT_NEVER = 0;
+
+    static final String SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP =
+        "discoverable_end_timestamp";
+
+    private static final String VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES = "twomin";
+    private static final String VALUE_DISCOVERABLE_TIMEOUT_FIVE_MINUTES = "fivemin";
+    private static final String VALUE_DISCOVERABLE_TIMEOUT_ONE_HOUR = "onehour";
+    private static final String VALUE_DISCOVERABLE_TIMEOUT_NEVER = "never";
+
+    static final int DEFAULT_DISCOVERABLE_TIMEOUT = DISCOVERABLE_TIMEOUT_TWO_MINUTES;
 
     private final Context mContext;
     private final Handler mUiHandler;
     private final CheckBoxPreference mCheckBoxPreference;
+    private final ListPreference mTimeoutListPreference;
 
     private final LocalBluetoothManager mLocalManager;
 
@@ -69,12 +84,16 @@
         }
     };
 
-    public BluetoothDiscoverableEnabler(Context context, CheckBoxPreference checkBoxPreference) {
+    public BluetoothDiscoverableEnabler(Context context,
+            CheckBoxPreference checkBoxPreference, ListPreference timeoutListPreference) {
         mContext = context;
         mUiHandler = new Handler();
         mCheckBoxPreference = checkBoxPreference;
+        mTimeoutListPreference = timeoutListPreference;
 
         checkBoxPreference.setPersistent(false);
+        // we actually want to persist this since can't infer from BT device state
+        mTimeoutListPreference.setPersistent(true);
 
         mLocalManager = LocalBluetoothManager.getInstance(context);
         if (mLocalManager == null) {
@@ -91,7 +110,7 @@
         IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
         mContext.registerReceiver(mReceiver, filter);
         mCheckBoxPreference.setOnPreferenceChangeListener(this);
-
+        mTimeoutListPreference.setOnPreferenceChangeListener(this);
         handleModeChanged(mLocalManager.getBluetoothAdapter().getScanMode());
     }
 
@@ -102,12 +121,18 @@
 
         mUiHandler.removeCallbacks(mUpdateCountdownSummaryRunnable);
         mCheckBoxPreference.setOnPreferenceChangeListener(null);
+        mTimeoutListPreference.setOnPreferenceChangeListener(null);
         mContext.unregisterReceiver(mReceiver);
     }
 
     public boolean onPreferenceChange(Preference preference, Object value) {
-        // Turn on/off BT discoverability
-        setEnabled((Boolean) value);
+        if (preference == mCheckBoxPreference) {
+            // Turn on/off BT discoverability
+            setEnabled((Boolean) value);
+        } else if (preference == mTimeoutListPreference) {
+            mTimeoutListPreference.setValue((String) value);
+            setEnabled(true);
+        }
 
         return true;
     }
@@ -116,26 +141,52 @@
         BluetoothAdapter manager = mLocalManager.getBluetoothAdapter();
 
         if (enable) {
-
             int timeout = getDiscoverableTimeout();
             manager.setDiscoverableTimeout(timeout);
 
-            mCheckBoxPreference.setSummaryOn(
-                    mContext.getResources().getString(R.string.bluetooth_is_discoverable, timeout));
-
-            long endTimestamp = System.currentTimeMillis() + timeout * 1000;
+            long endTimestamp = System.currentTimeMillis() + timeout * 1000L;
             persistDiscoverableEndTimestamp(endTimestamp);
 
-            manager.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+            updateCountdownSummary();
+
+            manager.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
         } else {
             manager.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
         }
     }
 
+    private void updateTimerDisplay(int timeout) {
+        if (getDiscoverableTimeout() == DISCOVERABLE_TIMEOUT_NEVER) {
+            mCheckBoxPreference.setSummaryOn(
+                mContext.getResources()
+                .getString(R.string.bluetooth_is_discoverable_always));
+        } else {
+            mCheckBoxPreference.setSummaryOn(
+                mContext.getResources()
+                .getString(R.string.bluetooth_is_discoverable, timeout));
+        }
+    }
+
     private int getDiscoverableTimeout() {
         int timeout = SystemProperties.getInt(SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT, -1);
-        if (timeout <= 0) {
-            timeout = DEFAULT_DISCOVERABLE_TIMEOUT;
+        if (timeout < 0) {
+            String timeoutValue = null;
+            if (mTimeoutListPreference != null && mTimeoutListPreference.getValue() != null) {
+                timeoutValue = mTimeoutListPreference.getValue().toString();
+            } else {
+                mTimeoutListPreference.setValue(VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES);
+                return DISCOVERABLE_TIMEOUT_TWO_MINUTES;
+            }
+
+            if (timeoutValue.equals(VALUE_DISCOVERABLE_TIMEOUT_NEVER)) {
+                timeout = DISCOVERABLE_TIMEOUT_NEVER;
+            } else if (timeoutValue.equals(VALUE_DISCOVERABLE_TIMEOUT_ONE_HOUR)) {
+                timeout = DISCOVERABLE_TIMEOUT_ONE_HOUR;
+            } else if (timeoutValue.equals(VALUE_DISCOVERABLE_TIMEOUT_FIVE_MINUTES)) {
+                timeout = DISCOVERABLE_TIMEOUT_FIVE_MINUTES;
+            } else {
+                timeout = DISCOVERABLE_TIMEOUT_TWO_MINUTES;
+            }
         }
 
         return timeout;
@@ -151,7 +202,6 @@
         if (mode == BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             mCheckBoxPreference.setChecked(true);
             updateCountdownSummary();
-
         } else {
             mCheckBoxPreference.setChecked(false);
         }
@@ -173,11 +223,8 @@
             return;
         }
 
-        String formattedTimeLeft = String.valueOf((endTimestamp - currentTimestamp) / 1000);
-
-        mCheckBoxPreference.setSummaryOn(
-                mContext.getResources().getString(R.string.bluetooth_is_discoverable,
-                        formattedTimeLeft));
+        int timeLeft = (int) ((endTimestamp - currentTimestamp) / 1000L);
+        updateTimerDisplay(timeLeft);
 
         synchronized (this) {
             mUiHandler.removeCallbacks(mUpdateCountdownSummaryRunnable);
diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
index 3023daf..fa0c2c3 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
@@ -128,13 +128,11 @@
 
                 mManager.getCachedDeviceManager().onProfileStateChanged(device,
                         Profile.A2DP, newState);
-            } else if (action.equals(BluetoothInputDevice.ACTION_INPUT_DEVICE_STATE_CHANGED)) {
-                final int newState = intent.getIntExtra(
-                        BluetoothInputDevice.EXTRA_INPUT_DEVICE_STATE, 0);
-                final int oldState = intent.getIntExtra(
-                        BluetoothInputDevice.EXTRA_PREVIOUS_INPUT_DEVICE_STATE, 0);
-                if (newState == BluetoothInputDevice.STATE_DISCONNECTED &&
-                        oldState == BluetoothInputDevice.STATE_CONNECTING) {
+            } else if (action.equals(BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED)) {
+                final int newState = intent.getIntExtra(BluetoothProfile.EXTRA_STATE, 0);
+                final int oldState = intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, 0);
+                if (newState == BluetoothProfile.STATE_DISCONNECTED &&
+                        oldState == BluetoothProfile.STATE_CONNECTING) {
                     Log.i(TAG, "Failed to connect BT HID");
                 }
 
@@ -202,7 +200,7 @@
 
         // Fine-grained state broadcasts
         filter.addAction(BluetoothPan.ACTION_PAN_STATE_CHANGED);
-        filter.addAction(BluetoothInputDevice.ACTION_INPUT_DEVICE_STATE_CHANGED);
+        filter.addAction(BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED);
         filter.addAction(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
         filter.addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
         filter.addAction(BluetoothDevice.ACTION_CLASS_CHANGED);
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index c1fda6b..07121e9 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -20,8 +20,11 @@
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
 import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
@@ -38,6 +41,7 @@
 
     private static final String KEY_BT_CHECKBOX = "bt_checkbox";
     private static final String KEY_BT_DISCOVERABLE = "bt_discoverable";
+    private static final String KEY_BT_DISCOVERABLE_TIMEOUT = "bt_discoverable_timeout";
     private static final String KEY_BT_NAME = "bt_name";
     private static final String KEY_BT_SHOW_RECEIVED = "bt_show_received_files";
 
@@ -56,7 +60,8 @@
                 (CheckBoxPreference) findPreference(KEY_BT_CHECKBOX));
 
         mDiscoverableEnabler = new BluetoothDiscoverableEnabler(activity,
-                (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE));
+                (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE),
+                    (ListPreference) findPreference(KEY_BT_DISCOVERABLE_TIMEOUT));
 
         mNamePreference = (BluetoothNamePreference) findPreference(KEY_BT_NAME);
     }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index de15dcc..889cb8a 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -639,29 +639,39 @@
         }
     }
 
-    private static class HidProfileManager extends LocalBluetoothProfileManager {
-        private final BluetoothInputDevice mService;
+    private static class HidProfileManager extends LocalBluetoothProfileManager
+            implements BluetoothProfile.ServiceListener {
+        private BluetoothInputDevice mService;
 
         public HidProfileManager(LocalBluetoothManager localManager) {
             super(localManager);
-            mService = new BluetoothInputDevice(localManager.getContext());
+            BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+            adapter.getProfileProxy(localManager.getContext(), this, BluetoothProfile.INPUT_DEVICE);
+        }
+
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            mService = (BluetoothInputDevice) proxy;
+        }
+
+        public void onServiceDisconnected(int profile) {
+            mService = null;
         }
 
         @Override
         public boolean connect(BluetoothDevice device) {
-            return mService.connectInputDevice(device);
+            return mService.connect(device);
         }
 
         @Override
         public int convertState(int hidState) {
             switch (hidState) {
-            case BluetoothInputDevice.STATE_CONNECTED:
+            case BluetoothProfile.STATE_CONNECTED:
                 return SettingsBtStatus.CONNECTION_STATUS_CONNECTED;
-            case BluetoothInputDevice.STATE_CONNECTING:
+            case BluetoothProfile.STATE_CONNECTING:
                 return SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
-            case BluetoothInputDevice.STATE_DISCONNECTED:
+            case BluetoothProfile.STATE_DISCONNECTED:
                 return SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED;
-            case BluetoothInputDevice.STATE_DISCONNECTING:
+            case BluetoothProfile.STATE_DISCONNECTING:
                 return SettingsBtStatus.CONNECTION_STATUS_DISCONNECTING;
             default:
                 return SettingsBtStatus.CONNECTION_STATUS_UNKNOWN;
@@ -670,22 +680,22 @@
 
         @Override
         public boolean disconnect(BluetoothDevice device) {
-            return mService.disconnectInputDevice(device);
+            return mService.disconnect(device);
         }
 
         @Override
         public List<BluetoothDevice> getConnectedDevices() {
-            return mService.getConnectedInputDevices();
+            return mService.getConnectedDevices();
         }
 
         @Override
         public int getConnectionStatus(BluetoothDevice device) {
-            return convertState(mService.getInputDeviceState(device));
+            return convertState(mService.getConnectionState(device));
         }
 
         @Override
         public int getPreferred(BluetoothDevice device) {
-            return mService.getInputDevicePriority(device);
+            return mService.getPriority(device);
         }
 
         @Override
@@ -701,7 +711,7 @@
 
         @Override
         public boolean isPreferred(BluetoothDevice device) {
-            return mService.getInputDevicePriority(device) > BluetoothInputDevice.PRIORITY_OFF;
+            return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
         }
 
         @Override
@@ -712,11 +722,11 @@
         @Override
         public void setPreferred(BluetoothDevice device, boolean preferred) {
             if (preferred) {
-                if (mService.getInputDevicePriority(device) < BluetoothInputDevice.PRIORITY_ON) {
-                    mService.setInputDevicePriority(device, BluetoothInputDevice.PRIORITY_ON);
+                if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
+                    mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
                 }
             } else {
-                mService.setInputDevicePriority(device, BluetoothInputDevice.PRIORITY_OFF);
+                mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
             }
         }
 
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 97ec017..93d05bc 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -43,7 +43,7 @@
 
     private static final String TAG = "RequestPermissionActivity";
 
-    private static final int MAX_DISCOVERABLE_TIMEOUT = 300;
+    private static final int MAX_DISCOVERABLE_TIMEOUT = 3600; // 1 hr
 
     // Non-error return code: BT is starting or has started successfully. Used
     // by this Activity and RequestPermissionHelperActivity
@@ -157,7 +157,14 @@
             builder.setCancelable(false);
         } else {
             // Ask the user whether to turn on discovery mode or not
-            builder.setMessage(getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout));
+            // For lasting discoverable mode there is a different message
+            if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) {
+                builder.setMessage(
+                        getString(R.string.bluetooth_ask_lasting_discovery));
+            } else {
+                builder.setMessage(
+                        getString(R.string.bluetooth_ask_discovery, mTimeout));
+            }
             builder.setPositiveButton(getString(R.string.yes), this);
             builder.setNegativeButton(getString(R.string.no), this);
         }
@@ -241,11 +248,9 @@
             mTimeout = intent.getIntExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION,
                     BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT);
 
-            Log.e(TAG, "Timeout = " + mTimeout);
+            Log.d(TAG, "Setting Bluetooth Discoverable Timeout = " + mTimeout);
 
-            if (mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
-                mTimeout = MAX_DISCOVERABLE_TIMEOUT;
-            } else if (mTimeout <= 0) {
+            if (mTimeout < 0 || mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
                 mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
             }
         } else {
diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
index c869868..2657d91 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
@@ -75,7 +75,11 @@
         if (mEnableOnly) {
             tv.setText(getString(R.string.bluetooth_ask_enablement));
         } else {
-            tv.setText(getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout));
+            if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) {
+                tv.setText(getString(R.string.bluetooth_ask_enablement_and_lasting_discovery));
+            } else {
+                tv.setText(getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout));
+            }
         }
 
         p.mPositiveButtonText = getString(R.string.yes);
diff --git a/src/com/android/settings/deviceinfo/Constants.java b/src/com/android/settings/deviceinfo/Constants.java
new file mode 100644
index 0000000..9f49479
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/Constants.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.os.Environment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Some of the constants used in this package
+ */
+class Constants {
+    static final int MEDIA_INDEX = 0;
+    static final int DOWNLOADS_INDEX = 1;
+    static final int PIC_VIDEO_INDEX = 2;
+    static final int MUSIC_INDEX = 3;
+    static final int MEDIA_APPS_DATA_INDEX = 4;
+    static final int MEDIA_MISC_INDEX = 5;
+    static final int NUM_MEDIA_DIRS_TRACKED = MEDIA_MISC_INDEX + 1;
+
+    static class MediaDirectory {
+        final String[] mDirPaths;
+        final String mKey;
+        final String mPreferenceName;
+        MediaDirectory(String pref, String debugInfo, String... paths) {
+            mDirPaths = paths;
+            mKey = debugInfo;
+            mPreferenceName = pref;
+        }
+    }
+    static final ArrayList<MediaDirectory> mMediaDirs = new ArrayList<MediaDirectory>();
+    static final List<String> ExclusionTargetsForMiscFiles = new ArrayList<String>();
+    static {
+        mMediaDirs.add(MEDIA_INDEX,
+                new MediaDirectory(null,
+                        "/sdcard",
+                        Environment.getExternalStorageDirectory().getAbsolutePath()));
+        mMediaDirs.add(DOWNLOADS_INDEX,
+                new MediaDirectory("memory_internal_downloads",
+                        "/sdcard/download",
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_DOWNLOADS).getAbsolutePath()));
+        mMediaDirs.add(PIC_VIDEO_INDEX,
+                new MediaDirectory("memory_internal_dcim",
+                        "/sdcard/pic_video",
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_DCIM).getAbsolutePath(),
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_MOVIES).getAbsolutePath(),
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_PICTURES).getAbsolutePath()));
+        mMediaDirs.add(MUSIC_INDEX,
+                new MediaDirectory("memory_internal_music",
+                        "/sdcard/audio",
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_MUSIC).getAbsolutePath(),
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_ALARMS).getAbsolutePath(),
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_NOTIFICATIONS).getAbsolutePath(),
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_RINGTONES).getAbsolutePath(),
+                        Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_PODCASTS).getAbsolutePath()));
+        mMediaDirs.add(MEDIA_APPS_DATA_INDEX,
+                new MediaDirectory(null,
+                        "/sdcard/Android",
+                        Environment.getExternalStorageAndroidDataDir().getAbsolutePath()));
+        mMediaDirs.add(MEDIA_MISC_INDEX,
+                new MediaDirectory("memory_internal_media_misc",
+                        "misc on /sdcard",
+                        "not relevant"));
+        // prepare a lit of strings representing dirpaths that should be skipped while looking
+        // for 'other' files
+        for (int j = 0; j < Constants.NUM_MEDIA_DIRS_TRACKED - 1; j++) {
+            String[] dirs = Constants.mMediaDirs.get(j).mDirPaths;
+            int len = dirs.length;
+            if (len > 0) {
+                for (int k = 0; k < len; k++) {
+                    ExclusionTargetsForMiscFiles.add(dirs[k]);
+                }
+            }
+            // also add /sdcard/Android
+            ExclusionTargetsForMiscFiles.add(
+                    Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android");
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/FileItemInfoLayout.java b/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
new file mode 100644
index 0000000..990f7f2
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
@@ -0,0 +1,78 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+
+package com.android.settings.deviceinfo;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.os.Environment;
+import android.util.AttributeSet;
+import android.view.ViewDebug;
+import android.widget.CheckBox;
+import android.widget.Checkable;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+/**
+ * Handles display of a single row entry on Settings --> Storage --> Misc Files screen
+ */
+public class FileItemInfoLayout extends RelativeLayout implements Checkable {
+    private TextView mFileNameView;
+    private TextView mFileSizeView;
+    private CheckBox mCheckbox;
+    private static final int mLengthExternalStorageDirPrefix =
+            Environment.getExternalStorageDirectory().getAbsolutePath().length() + 1;
+
+    public FileItemInfoLayout(Context context) {
+        this(context, null);
+    }
+
+    public FileItemInfoLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FileItemInfoLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public void toggle() {
+        setChecked(!mCheckbox.isChecked());
+    }
+
+    /* (non-Javadoc)
+     * @see android.view.View#onFinishInflate()
+     */
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mFileNameView = (TextView) findViewById(R.id.misc_filename);
+        mFileSizeView = (TextView) findViewById(R.id.misc_filesize);
+        mCheckbox = (CheckBox) findViewById(R.id.misc_checkbox);
+    }
+
+    public void setFileName(String fileName) {
+        mFileNameView.setText(fileName.substring(mLengthExternalStorageDirPrefix));
+    }
+
+    public void setFileSize(String filesize) {
+        mFileSizeView.setText(filesize);
+    }
+
+    @ViewDebug.ExportedProperty
+    public boolean isChecked() {
+        return mCheckbox.isChecked();
+    }
+
+    public CheckBox getCheckBox() {
+        return mCheckbox;
+    }
+
+    /**
+     * <p>Changes the checked state of this text view.</p>
+     *
+     * @param checked true to check the text, false to uncheck it
+     */
+    public void setChecked(boolean checked) {
+        mCheckbox.setChecked(checked);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index db1ff65..7cb378c 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -23,6 +23,7 @@
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -32,9 +33,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RectShape;
 import android.graphics.drawable.shapes.RoundRectShape;
-import android.hardware.UsbManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -56,8 +55,7 @@
 
 public class Memory extends SettingsPreferenceFragment implements OnCancelListener,
         MeasurementReceiver {
-    private static final String TAG = "Memory";
-    static final boolean localLOGV = false;
+    private static final String TAG = "MemorySettings";
 
     private static final String MEMORY_SD_SIZE = "memory_sd_size";
 
@@ -75,8 +73,6 @@
 
     private static final String MEMORY_INTERNAL_APPS = "memory_internal_apps";
 
-    private static final String MEMORY_INTERNAL_MEDIA = "memory_internal_media";
-
     private static final String MEMORY_INTERNAL_CHART = "memory_internal_chart";
 
     private static final int DLG_CONFIRM_UNMOUNT = 1;
@@ -94,13 +90,13 @@
     // Internal storage preferences
     private Preference mInternalSize;
     private Preference mInternalAvail;
-    private Preference mInternalMediaUsage;
     private Preference mInternalAppsUsage;
+    private final Preference[] mMediaPreferences = new Preference[Constants.NUM_MEDIA_DIRS_TRACKED];
     private UsageBarPreference mInternalUsageChart;
 
     // Internal storage chart colors
-    private int mInternalMediaColor;
     private int mInternalAppsColor;
+    private int mInternalAvailColor;
     private int mInternalUsedColor;
 
     boolean mSdMountToggleAdded = true;
@@ -134,9 +130,12 @@
                     Bundle bundle = msg.getData();
                     final long totalSize = bundle.getLong(MemoryMeasurement.TOTAL_SIZE);
                     final long availSize = bundle.getLong(MemoryMeasurement.AVAIL_SIZE);
-                    final long mediaUsed = bundle.getLong(MemoryMeasurement.MEDIA_USED);
                     final long appsUsed = bundle.getLong(MemoryMeasurement.APPS_USED);
-                    updateUiExact(totalSize, availSize, mediaUsed, appsUsed);
+                    final long[] mediaSizes = new long[Constants.NUM_MEDIA_DIRS_TRACKED];
+                    for (int i = 0; i < Constants.NUM_MEDIA_DIRS_TRACKED; i++) {
+                        mediaSizes[i] = bundle.getLong(Constants.mMediaDirs.get(i).mKey);
+                    }
+                    updateUiExact(totalSize, availSize, appsUsed, mediaSizes);
                     break;
                 }
                 case MSG_UI_UPDATE_EXTERNAL_APPROXIMATE: {
@@ -175,31 +174,59 @@
         }
 
         mInternalSize = findPreference(MEMORY_INTERNAL_SIZE);
-        mInternalAvail = findPreference(MEMORY_INTERNAL_AVAIL);
-        mInternalMediaUsage = findPreference(MEMORY_INTERNAL_MEDIA);
-        mInternalAppsUsage = findPreference(MEMORY_INTERNAL_APPS);
-
-        mInternalMediaColor = mRes.getColor(R.color.memory_media_usage);
         mInternalAppsColor = mRes.getColor(R.color.memory_apps_usage);
         mInternalUsedColor = android.graphics.Color.GRAY;
-
+        mInternalAvailColor = mRes.getColor(R.color.memory_avail);
+        final int buttonSize = (int) mRes.getDimension(R.dimen.device_memory_usage_button_size);
         float[] radius = new float[] {
                 5f, 5f, 5f, 5f, 5f, 5f, 5f, 5f
         };
         RoundRectShape shape1 = new RoundRectShape(radius, null, null);
 
-        ShapeDrawable mediaShape = new ShapeDrawable(shape1);
-        mediaShape.setIntrinsicWidth(32);
-        mediaShape.setIntrinsicHeight(32);
-        mediaShape.getPaint().setColor(mInternalMediaColor);
-        mInternalMediaUsage.setIcon(mediaShape);
+        // total available space
+        mInternalAvail = findPreference(MEMORY_INTERNAL_AVAIL);
+        ShapeDrawable availShape = new ShapeDrawable(shape1);
+        availShape.setIntrinsicWidth(buttonSize);
+        availShape.setIntrinsicHeight(buttonSize);
+        availShape.getPaint().setColor(mInternalAvailColor);
+        mInternalAvail.setIcon(availShape);
 
+        // used by apps
+        mInternalAppsUsage = findPreference(MEMORY_INTERNAL_APPS);
         ShapeDrawable appsShape = new ShapeDrawable(shape1);
-        appsShape.setIntrinsicWidth(32);
-        appsShape.setIntrinsicHeight(32);
+        appsShape.setIntrinsicWidth(buttonSize);
+        appsShape.setIntrinsicHeight(buttonSize);
         appsShape.getPaint().setColor(mInternalAppsColor);
         mInternalAppsUsage.setIcon(appsShape);
 
+        // space used by individual major directories on /sdcard
+        for (int i = 0; i < Constants.NUM_MEDIA_DIRS_TRACKED; i++) {
+            // nothing to be displayed for certain entries in Constants.mMediaDirs
+            if (Constants.mMediaDirs.get(i).mPreferenceName == null) {
+                continue;
+            }
+            mMediaPreferences[i] = findPreference(Constants.mMediaDirs.get(i).mPreferenceName);
+            ShapeDrawable shape = new ShapeDrawable(shape1);
+            shape.setIntrinsicWidth(buttonSize);
+            shape.setIntrinsicHeight(buttonSize);
+            int color = 0;
+            switch (i) {
+                case Constants.DOWNLOADS_INDEX:
+                    color = mRes.getColor(R.color.memory_downloads);
+                    break;
+                case Constants.PIC_VIDEO_INDEX:
+                    color = mRes.getColor(R.color.memory_video);
+                    break;
+                case Constants.MUSIC_INDEX:
+                    color = mRes.getColor(R.color.memory_audio);
+                    break;
+                case Constants.MEDIA_MISC_INDEX:
+                    color = mRes.getColor(R.color.memory_misc);
+                    break;
+            }
+            shape.getPaint().setColor(color);
+            mMediaPreferences[i].setIcon(shape);
+        }
         mInternalUsageChart = (UsageBarPreference) findPreference(MEMORY_INTERNAL_CHART);
 
         mMeasurement = MemoryMeasurement.getInstance(getActivity());
@@ -209,7 +236,7 @@
     @Override
     public void onResume() {
         super.onResume();
-
+        mMeasurement.setReceiver(this);
         IntentFilter intentFilter = new IntentFilter(Intent.ACTION_MEDIA_SCANNER_STARTED);
         intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
         intentFilter.addDataScheme("file");
@@ -282,6 +309,27 @@
                     com.android.settings.Settings.ManageApplicationsActivity.class);
             startActivity(intent);
             return true;
+        } else if (preference == mMediaPreferences[Constants.DOWNLOADS_INDEX]) {
+            Intent intent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS)
+                    .putExtra(DownloadManager.INTENT_EXTRAS_SORT_BY_SIZE, true);
+            startActivity(intent);
+            return true;
+        } else if (preference == mMediaPreferences[Constants.MUSIC_INDEX]) {
+            Intent intent = new Intent("android.intent.action.GET_CONTENT");
+            intent.setType("audio/mp3");
+            startActivity(intent);
+            return true;
+        } else if (preference == mMediaPreferences[Constants.PIC_VIDEO_INDEX]) {
+            Intent intent = new Intent("android.intent.action.GET_CONTENT");
+            intent.setType("image/jpeg");
+            startActivity(intent);
+            return true;
+        } else if (preference == mMediaPreferences[Constants.MEDIA_MISC_INDEX]) {
+            Context context = getActivity().getApplicationContext();
+            if (MemoryMeasurement.getInstance(context).isSizeOfMiscCategorynonZero()) {
+                startActivity(new Intent(context, MiscFilesHandler.class));
+            }
+            return true;
         }
 
         return false;
@@ -375,7 +423,6 @@
         // Check if external media is in use.
         try {
            if (hasAppsAccessingStorage()) {
-               if (localLOGV) Log.i(TAG, "Do have storage users accessing media");
                // Present dialog to user
                showDialogInner(DLG_CONFIRM_UNMOUNT);
            } else {
@@ -400,19 +447,45 @@
         }
     }
 
-    private void updateUiExact(long totalSize, long availSize, long mediaSize, long appsSize) {
+    private void updateUiExact(long totalSize, long availSize, long appsSize, long[] mediaSizes) {
         // There are other things that can take up storage, but we didn't measure it.
         // add that unaccounted-for-usage to Apps Usage
-        final long appsPlusRemaining = totalSize - availSize - mediaSize;
-
+        long appsPlusRemaining = totalSize - availSize - mediaSizes[Constants.DOWNLOADS_INDEX] -
+                mediaSizes[Constants.PIC_VIDEO_INDEX] - mediaSizes[Constants.MUSIC_INDEX] -
+                mediaSizes[Constants.MEDIA_MISC_INDEX];
         mInternalSize.setSummary(formatSize(totalSize));
         mInternalAvail.setSummary(formatSize(availSize));
-        mInternalMediaUsage.setSummary(formatSize(mediaSize));
         mInternalAppsUsage.setSummary(formatSize(appsPlusRemaining));
 
         mInternalUsageChart.clear();
-        mInternalUsageChart.addEntry(mediaSize / (float) totalSize, mInternalMediaColor);
         mInternalUsageChart.addEntry(appsPlusRemaining / (float) totalSize, mInternalAppsColor);
+
+        for (int i = 0; i < Constants.NUM_MEDIA_DIRS_TRACKED; i++) {
+            if (Constants.mMediaDirs.get(i).mPreferenceName == null) {
+                continue;
+            }
+            this.mMediaPreferences[i].setSummary(formatSize(mediaSizes[i]));
+            // don't add entry to color chart for media usage and for zero-sized dirs
+            if (i != Constants.MEDIA_INDEX && mediaSizes[i] > 0) {
+                int color = 0;
+                switch (i) {
+                    case Constants.DOWNLOADS_INDEX:
+                        color = mRes.getColor(R.color.memory_downloads);
+                        break;
+                    case Constants.PIC_VIDEO_INDEX:
+                        color = mRes.getColor(R.color.memory_video);
+                        break;
+                    case Constants.MUSIC_INDEX:
+                        color = mRes.getColor(R.color.memory_audio);
+                        break;
+                    case Constants.MEDIA_MISC_INDEX:
+                        color = mRes.getColor(R.color.memory_misc);
+                        break;
+                }
+                mInternalUsageChart.addEntry(mediaSizes[i] / (float) totalSize, color);
+            }
+        }
+        mInternalUsageChart.addEntry(availSize / (float) totalSize, mInternalAvailColor);
         mInternalUsageChart.commit();
     }
 
diff --git a/src/com/android/settings/deviceinfo/MemoryMeasurement.java b/src/com/android/settings/deviceinfo/MemoryMeasurement.java
index 1aef202..3f57f21 100644
--- a/src/com/android/settings/deviceinfo/MemoryMeasurement.java
+++ b/src/com/android/settings/deviceinfo/MemoryMeasurement.java
@@ -23,6 +23,7 @@
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -35,14 +36,16 @@
  *
  *   Filesystem stats (using StatFs)
  *   Directory measurements (using DefaultContainerService.measureDir)
- *   Applicaiton measurements (using PackageManager)
+ *   Application measurements (using PackageManager)
  *
  * Then the calling application would just specify the type and an argument.
  * This class would keep track of it while the calling application would
  * decide on how to use it.
  */
 public class MemoryMeasurement {
-    private static final String TAG = "MemoryMeasurement";
+    private static final String TAG = "MemorySettings";
+    private static final boolean LOCAL_LOGV = true;
+    static final boolean LOGV = LOCAL_LOGV && Log.isLoggable(TAG, Log.VERBOSE);
 
     public static final String TOTAL_SIZE = "total_size";
 
@@ -50,7 +53,7 @@
 
     public static final String APPS_USED = "apps_used";
 
-    public static final String MEDIA_USED = "media_used";
+    private long[] mMediaSizes = new long[Constants.NUM_MEDIA_DIRS_TRACKED];
 
     private static final String DEFAULT_CONTAINER_PACKAGE = "com.android.defcontainer";
 
@@ -66,13 +69,13 @@
     // Internal memory fields
     private long mInternalTotalSize;
     private long mInternalAvailSize;
-    private long mInternalMediaSize;
     private long mInternalAppsSize;
 
     // External memory fields
     private long mExternalTotalSize;
 
     private long mExternalAvailSize;
+    List<FileInfo> mFileInfoForMisc;
 
     private MemoryMeasurement(Context context) {
         // Start the thread that will measure the disk usage.
@@ -98,7 +101,9 @@
     }
 
     public void setReceiver(MeasurementReceiver receiver) {
-        mReceiver = new WeakReference<MeasurementReceiver>(receiver);
+        if (mReceiver == null || mReceiver.get() == null) {
+            mReceiver = new WeakReference<MeasurementReceiver>(receiver);
+        }
     }
 
     public void measureExternal() {
@@ -134,6 +139,9 @@
     private void sendInternalExactUpdate() {
         MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
         if (receiver == null) {
+            if (LOGV) {
+                Log.i(TAG, "measurements dropped because receiver is null! wasted effort");
+            }
             return;
         }
 
@@ -141,7 +149,9 @@
         bundle.putLong(TOTAL_SIZE, mInternalTotalSize);
         bundle.putLong(AVAIL_SIZE, mInternalAvailSize);
         bundle.putLong(APPS_USED, mInternalAppsSize);
-        bundle.putLong(MEDIA_USED, mInternalMediaSize);
+        for (int i = 0; i < Constants.NUM_MEDIA_DIRS_TRACKED; i++) {
+            bundle.putLong(Constants.mMediaDirs.get(i).mKey, mMediaSizes[i]);
+        }
 
         receiver.updateExactInternal(bundle);
     }
@@ -252,6 +262,7 @@
                 case MSG_CONNECTED: {
                     IMediaContainerService imcs = (IMediaContainerService) msg.obj;
                     measureExactInternalStorage(imcs);
+                    break;
                 }
                 case MSG_DISCONNECT: {
                     synchronized (mLock) {
@@ -265,6 +276,7 @@
                             context.unbindService(mDefContainerConn);
                         }
                     }
+                    break;
                 }
                 case MSG_COMPLETED: {
                     mMeasured = true;
@@ -356,24 +368,40 @@
             if (context == null) {
                 return;
             }
-
             // We have to get installd to measure the package sizes.
             PackageManager pm = context.getPackageManager();
             if (pm == null) {
                 return;
             }
-
-            long mediaSize;
-            try {
-                mediaSize = imcs.calculateDirectorySize(
-                        Environment.getExternalStorageDirectory().getAbsolutePath());
-            } catch (Exception e) {
-                Log.i(TAG, "Could not read memory from default container service");
-                return;
+            // measure sizes for all except "media_misc" - which is computed
+            for (int i = 0; i < Constants.NUM_MEDIA_DIRS_TRACKED - 1; i++) {
+                mMediaSizes[i] = 0;
+                String[] dirs = Constants.mMediaDirs.get(i).mDirPaths;
+                int len = dirs.length;
+                if (len > 0) {
+                    for (int k = 0; k < len; k++) {
+                        long dirSize = getSize(imcs, dirs[k]);
+                        mMediaSizes[i] += dirSize;
+                        if (LOGV) {
+                            Log.i(TAG, "size of " + dirs[k] + ": " + dirSize);
+                        }
+                    }
+                }
             }
 
-            mInternalMediaSize = mediaSize;
+            // compute the size of "misc"
+            mMediaSizes[Constants.MEDIA_MISC_INDEX] = mMediaSizes[Constants.MEDIA_INDEX];
+            for (int i = 1; i < Constants.NUM_MEDIA_DIRS_TRACKED - 1; i++) {
+                mMediaSizes[Constants.MEDIA_MISC_INDEX] -= mMediaSizes[i];
+            }
+            if (LOGV) {
+                Log.i(TAG, "media_misc size: " + mMediaSizes[Constants.MEDIA_MISC_INDEX]);
+            }
 
+            // compute the sizes of each of the files/directories under 'misc' category
+            measureSizesOfMisc(imcs);
+
+            // compute apps sizes
             final List<ApplicationInfo> apps = pm
                     .getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES
                             | PackageManager.GET_DISABLED_COMPONENTS);
@@ -393,6 +421,43 @@
             // Sending of the message back to the MeasurementReceiver is
             // completed in the PackageObserver
         }
+        private void measureSizesOfMisc(IMediaContainerService imcs) {
+            File top = Environment.getExternalStorageDirectory();
+            mFileInfoForMisc = new ArrayList<FileInfo>();
+            File[] files = top.listFiles();
+            int len = files.length;
+            if (len == 0) {
+                return;
+            }
+            // get sizes of all top level nodes in /sdcard dir except the ones already computed...
+            long counter = 0;
+            for (int i = 0; i < len; i++) {
+                String path = files[i].getAbsolutePath();
+                if (Constants.ExclusionTargetsForMiscFiles.contains(path)) {
+                    continue;
+                }
+                if (files[i].isFile()) {
+                    mFileInfoForMisc.add(new FileInfo(path, files[i].length(), counter++));
+                } else if (files[i].isDirectory()) {
+                    long dirSize = getSize(imcs, path);
+                    mFileInfoForMisc.add(new FileInfo(path, dirSize, counter++));
+                } else {
+                }
+            }
+            // sort the list of FileInfo objects collected above in descending order of their sizes
+            Collections.sort(mFileInfoForMisc);
+        }
+
+        private long getSize(IMediaContainerService imcs, String dir) {
+            try {
+                long size = imcs.calculateDirectorySize(dir);
+                return size;
+            } catch (Exception e) {
+                Log.w(TAG, "Could not read memory from default container service for " +
+                        dir, e);
+                return -1;
+            }
+        }
 
         public void measureApproximateExternalStorage() {
             File path = Environment.getExternalStorageDirectory();
@@ -412,4 +477,29 @@
     public void invalidate() {
         mHandler.sendEmptyMessage(MeasurementHandler.MSG_INVALIDATE);
     }
+
+    boolean isSizeOfMiscCategorynonZero() {
+        return mFileInfoForMisc.size() > 0;
+    }
+
+    static class FileInfo implements Comparable<FileInfo> {
+        String mFileName;
+        long mSize;
+        long mId;
+        FileInfo(String fileName, long size, long id) {
+            mFileName = fileName;
+            mSize = size;
+            mId = id;
+        }
+        @Override
+        public int compareTo(FileInfo that) {
+            if (this == that || mSize == that.mSize) return 0;
+            else if (mSize < that.mSize) return 1; // for descending sort
+            else return -1;
+        }
+        @Override
+        public String toString() {
+            return mFileName  + " : " + mSize + ", id:" + mId;
+        }
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/MiscFilesHandler.java b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
new file mode 100644
index 0000000..5a92115
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import com.android.settings.R;
+import com.android.settings.deviceinfo.MemoryMeasurement.FileInfo;
+
+import android.app.ListActivity;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.util.SparseBooleanArray;
+import android.view.ActionMode;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ListView;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class handles the selection and removal of Misc files.
+ */
+public class MiscFilesHandler extends ListActivity {
+    private static final String TAG = "MemorySettings";
+    private String mNumSelectedStr;
+    private String mNumSelectedOutOfStr;
+    private MemoryMearurementAdapter mAdapter;
+    private LayoutInflater mInflater;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setFinishOnTouchOutside(true);
+        setTitle(R.string.misc_files);
+        mNumSelectedStr = getString(R.string.misc_files_selected_count);
+        mNumSelectedOutOfStr = getString(R.string.misc_files_selected_count_out_of);
+        mAdapter = new MemoryMearurementAdapter(this);
+        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        setContentView(R.layout.settings_storage_miscfiles_list);
+        ListView lv = getListView();
+        lv.setItemsCanFocus(true);
+        lv.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
+        lv.setMultiChoiceModeListener(new ModeCallback(this));
+        setListAdapter(mAdapter);
+    } 
+
+    private class ModeCallback implements ListView.MultiChoiceModeListener {
+        private int mDataCount;
+        private final Context mContext;
+
+        public ModeCallback(Context context) {
+            mContext = context;
+            mDataCount = mAdapter.getCount();
+        }
+
+        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            final MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.misc_files_menu, menu);
+            return true;
+        }
+
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            return true;
+        }
+
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+            ListView lv = getListView();
+            switch (item.getItemId()) {
+            case R.id.action_delete:
+                // delete the files selected
+                SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
+                int checkedCount = getListView().getCheckedItemCount();
+                if (checkedCount > mDataCount) {
+                    throw new IllegalStateException("checked item counts do not match. " +
+                            "checkedCount: " + checkedCount + ", dataSize: " + mDataCount);
+                }
+                if (mDataCount > 0) {
+                    ArrayList<Object> toRemove = new ArrayList<Object>();
+                    for (int i = 0; i < mDataCount; i++) {
+                        if (!checkedItems.get(i)) {
+                            //item not selected
+                            continue;
+                        }
+                        if (MemoryMeasurement.LOGV) {
+                            Log.i(TAG, "deleting: " + mAdapter.getItem(i));
+                        }
+                        // delete the file
+                        File file = new File(mAdapter.getItem(i).mFileName);
+                        if (file.isDirectory()) {
+                            deleteDir(file);
+                        } else {
+                            file.delete();                            
+                        }
+                        toRemove.add(mAdapter.getItem(i));
+                    }
+                    mAdapter.removeAll(toRemove);
+                    mAdapter.notifyDataSetChanged();
+                    mDataCount = mAdapter.getCount();
+                }
+                mode.finish();
+                break;
+
+            case R.id.action_select_all:
+                // check ALL items
+                for (int i = 0; i < mDataCount; i++) {
+                    lv.setItemChecked(i, true);
+                }
+                // update the title and subtitle with number selected and numberBytes selected
+                onItemCheckedStateChanged(mode, 1, 0, true);
+                break;
+            }
+            return true;
+        }
+
+        // Deletes all files and subdirectories under given dir.
+        // Returns true if all deletions were successful.
+        // If a deletion fails, the method stops attempting to delete and returns false.
+        private boolean deleteDir(File dir) {
+            if (dir.isDirectory()) {
+                String[] children = dir.list();
+                for (int i=0; i < children.length; i++) {
+                    boolean success = deleteDir(new File(dir, children[i]));
+                    if (!success) {
+                        return false;
+                    }
+                }
+            }
+            // The directory is now empty so delete it
+            return dir.delete();
+        }
+
+        public void onDestroyActionMode(ActionMode mode) {
+        }
+
+        public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
+                boolean checked) {
+            ListView lv = getListView();
+            int numChecked = lv.getCheckedItemCount();
+            mode.setTitle(mNumSelectedStr + " : " + numChecked +
+                    " " + mNumSelectedOutOfStr + " " + mAdapter.getCount());
+
+            // total the sizes of all items selected so far
+            SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
+            long selectedDataSize = 0;
+            if (numChecked > 0) {
+                for (int i = 0; i < mDataCount; i++) {
+                    if (checkedItems.get(i)) {
+                        // item is checked
+                        selectedDataSize += mAdapter.getItem(i).mSize;
+                    }
+                }
+            }
+            mode.setSubtitle(Formatter.formatFileSize(mContext, selectedDataSize) +
+                    " " + mNumSelectedOutOfStr + " " +
+                    Formatter.formatFileSize(mContext, mAdapter.getDataSize()));
+        }
+    }
+
+    public class MemoryMearurementAdapter extends BaseAdapter {
+        private ArrayList<MemoryMeasurement.FileInfo> mData = null;
+        private long mDataSize = 0;
+        private Context mContext;
+
+        public MemoryMearurementAdapter(Context context) {
+            mContext = context;
+            MemoryMeasurement mMeasurement = MemoryMeasurement.getInstance(context);
+            mData = (ArrayList<MemoryMeasurement.FileInfo>)mMeasurement.mFileInfoForMisc;
+            if (mData != null) {
+                for (MemoryMeasurement.FileInfo info : mData) {
+                    mDataSize += info.mSize;
+                }
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return (mData == null) ? 0 : mData.size();
+        }
+
+        @Override
+        public MemoryMeasurement.FileInfo getItem(int position) {
+            if (mData == null || mData.size() <= position) {
+                return null;
+            }
+            return mData.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            if (mData == null || mData.size() <= position) {
+                return 0;
+            }
+            return mData.get(position).mId;
+        }
+        public void removeAll(List<Object> objs) {
+            if (mData == null) {
+                return;
+            }
+            for (Object o : objs) {
+                mData.remove(o);
+                mDataSize -= ((MemoryMeasurement.FileInfo) o).mSize;
+            }
+        }
+
+        public long getDataSize() {
+            return mDataSize;
+        }
+
+        @Override
+        public void notifyDataSetChanged() {
+            super.notifyDataSetChanged();
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final FileItemInfoLayout view = (convertView == null) ?
+                    (FileItemInfoLayout) mInflater.inflate(R.layout.settings_storage_miscfiles,
+                            parent, false) : (FileItemInfoLayout) convertView;
+            FileInfo item = getItem(position);
+            view.setFileName(item.mFileName);
+            view.setFileSize(Formatter.formatFileSize(mContext, item.mSize));
+            final ListView listView = (ListView) parent;
+            final int listPosition = position;
+            view.getCheckBox().setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                
+                @Override
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    listView.setItemChecked(listPosition, isChecked);
+                }
+                
+            });
+            view.setOnLongClickListener(new OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (listView.getCheckedItemCount() > 0) {
+                        return false;
+                    }
+                    listView.setItemChecked(listPosition, !view.isChecked());
+                    return true;
+                }
+            });
+            view.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (listView.getCheckedItemCount() > 0) {
+                        listView.setItemChecked(listPosition, !view.isChecked());
+                    }
+                }
+            });
+            return view;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index f171c81..0350631 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -373,7 +373,7 @@
 
             if (-1 == signalDbm) signalDbm = 0;
 
-            int signalAsu = mPhoneStateReceiver.getSignalStrength();
+            int signalAsu = mPhoneStateReceiver.getSignalStrengthLevelAsu();
 
             if (-1 == signalAsu) signalAsu = 0;
 
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 9fafc56..c5cba03 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -42,6 +42,7 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.telephony.SignalStrength;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Menu;
@@ -572,7 +573,7 @@
 
     private void addRadioUsage(long uSecNow) {
         double power = 0;
-        final int BINS = BatteryStats.NUM_SIGNAL_STRENGTH_BINS;
+        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
         long signalTimeMs = 0;
         for (int i = 0; i < BINS; i++) {
             long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index 8003041..362fbb5 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -159,7 +159,7 @@
         HashSet<String> disabledSystemIMEs = getDisabledSystemIMEs(resolver);
 
         final boolean onlyOneIME = inputMethodInfos.size() == 1;
-        boolean existsSelectedSubtype = false;
+        boolean needsToResetSelectedSubtype = false;
         for (InputMethodInfo imi : inputMethodInfos) {
             final String imiId = imi.getId();
             Preference pref = context.findPreference(imiId);
@@ -178,7 +178,7 @@
                 }
                 HashSet<String> subtypesSet = enabledIMEAndSubtypesMap.get(imiId);
 
-                boolean subtypeCleared = false;
+                boolean subtypePrefFound = false;
                 final int subtypeCount = imi.getSubtypeCount();
                 for (int i = 0; i < subtypeCount; ++i) {
                     InputMethodSubtype subtype = imi.getSubtypeAt(i);
@@ -187,17 +187,21 @@
                             imiId + subtypeHashCodeStr);
                     // In the Configure input method screen which does not have subtype preferences.
                     if (subtypePref == null) continue;
-                    // Once subtype checkbox is found, subtypeSet needs to be cleared.
-                    // Because of system change, hashCode value could have been changed.
-                    if (!subtypeCleared) {
+                    if (!subtypePrefFound) {
+                        // Once subtype checkbox is found, subtypeSet needs to be cleared.
+                        // Because of system change, hashCode value could have been changed.
                         subtypesSet.clear();
-                        subtypeCleared = true;
+                        // If selected subtype preference is disabled, needs to reset.
+                        needsToResetSelectedSubtype = true;
+                        subtypePrefFound = true;
                     }
                     if (subtypePref.isChecked()) {
                         subtypesSet.add(subtypeHashCodeStr);
                         if (isCurrentInputMethod) {
                             if (selectedInputMethodSubtype == subtype.hashCode()) {
-                                existsSelectedSubtype = true;
+                                // Selected subtype is still enabled, there is no need to reset
+                                // selected subtype.
+                                needsToResetSelectedSubtype = false;
                             }
                         }
                     } else {
@@ -241,12 +245,14 @@
             Log.d(TAG, "--- Save disable system inputmethod settings. :"
                     + disabledSysImesBuilder.toString());
             Log.d(TAG, "--- Save default inputmethod settings. :" + currentInputMethodId);
+            Log.d(TAG, "--- Needs to reset the selected subtype :" + needsToResetSelectedSubtype);
+            Log.d(TAG, "--- Subtype is selected :" + isInputMethodSubtypeSelected(resolver));
         }
 
         // Redefines SelectedSubtype when all subtypes are unchecked or there is no subtype
         // selected. And if the selected subtype of the current input method was disabled,
         // We should reset the selected input method's subtype.
-        if (!existsSelectedSubtype || !isInputMethodSubtypeSelected(resolver)) {
+        if (needsToResetSelectedSubtype || !isInputMethodSubtypeSelected(resolver)) {
             if (DEBUG) {
                 Log.d(TAG, "--- Reset inputmethod subtype because it's not defined.");
             }
diff --git a/src/com/android/settings/inputmethod/InputMethodConfig.java b/src/com/android/settings/inputmethod/InputMethodConfig.java
index f2bdafd..2cfe35d 100644
--- a/src/com/android/settings/inputmethod/InputMethodConfig.java
+++ b/src/com/android/settings/inputmethod/InputMethodConfig.java
@@ -104,31 +104,28 @@
 
     private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref,
             final String imiId) {
-        if (mDialog == null) {
-            mDialog = (new AlertDialog.Builder(getActivity()))
-                    .setTitle(android.R.string.dialog_alert_title)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setCancelable(true)
-                    .setPositiveButton(android.R.string.ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            chkPref.setChecked(true);
-                            for (Preference pref: mInputMethodPrefsMap.get(imiId)) {
-                                pref.setEnabled(true);
-                            }
-                        }
-                    })
-                    .setNegativeButton(android.R.string.cancel,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                        }
-                    })
-                    .create();
-        } else {
-            if (mDialog.isShowing()) {
-                mDialog.dismiss();
-            }
+        if (mDialog != null && mDialog.isShowing()) {
+            mDialog.dismiss();
         }
+        mDialog = (new AlertDialog.Builder(getActivity()))
+                .setTitle(android.R.string.dialog_alert_title)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setCancelable(true)
+                .setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        chkPref.setChecked(true);
+                        for (Preference pref: mInputMethodPrefsMap.get(imiId)) {
+                            pref.setEnabled(true);
+                        }
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel,
+                        new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                    }
+                })
+                .create();
         mDialog.setMessage(getResources().getString(R.string.ime_security_warning,
                 imi.getServiceInfo().applicationInfo.loadLabel(getPackageManager())));
         mDialog.show();
diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index 539a51e..ba6258c 100644
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -683,7 +683,7 @@
     }
 
     private void startVpnTypeSelection() {
-        if (getActivity() == null) return;
+        if ((getActivity() == null) || isRemoving()) return;
 
         ((PreferenceActivity) getActivity()).startPreferencePanel(
                 VpnTypeSelection.class.getCanonicalName(), null, R.string.vpn_type_title, null,
@@ -738,7 +738,7 @@
     }
 
     private void startVpnEditor(final VpnProfile profile, boolean add) {
-        if (getActivity() == null) return;
+        if ((getActivity() == null) || isRemoving()) return;
 
         Bundle args = new Bundle();
         args.putParcelable(KEY_VPN_PROFILE, profile);
diff --git a/src/com/android/settings/wifi/WifiApDialog.java b/src/com/android/settings/wifi/WifiApDialog.java
index fde6efc..29c1a5d 100644
--- a/src/com/android/settings/wifi/WifiApDialog.java
+++ b/src/com/android/settings/wifi/WifiApDialog.java
@@ -46,12 +46,13 @@
 
     private final DialogInterface.OnClickListener mListener;
 
-    private static final int OPEN_INDEX = 0;
-    private static final int WPA_INDEX = 1;
+    static final int OPEN_INDEX = 0;
+    static final int WPA_INDEX = 1;
+    static final int WPA2_INDEX = 2;
 
     private View mView;
     private TextView mSsid;
-    private int mSecurityType = AccessPoint.SECURITY_NONE;
+    private int mSecurityTypeIndex = OPEN_INDEX;
     private EditText mPassword;
 
     WifiConfiguration mWifiConfig;
@@ -61,8 +62,18 @@
         super(context);
         mListener = listener;
         mWifiConfig = wifiConfig;
-        if (wifiConfig != null)
-          mSecurityType = AccessPoint.getSecurity(wifiConfig);
+        if (wifiConfig != null) {
+            mSecurityTypeIndex = getSecurityTypeIndex(wifiConfig);
+        }
+    }
+
+    public static int getSecurityTypeIndex(WifiConfiguration wifiConfig) {
+        if (wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
+            return WPA_INDEX;
+        } else if (wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA2_PSK)) {
+            return WPA2_INDEX;
+        }
+        return OPEN_INDEX;
     }
 
     public WifiConfiguration getConfig() {
@@ -77,12 +88,12 @@
          */
         config.SSID = mSsid.getText().toString();
 
-        switch (mSecurityType) {
-            case AccessPoint.SECURITY_NONE:
+        switch (mSecurityTypeIndex) {
+            case OPEN_INDEX:
                 config.allowedKeyManagement.set(KeyMgmt.NONE);
                 return config;
 
-            case AccessPoint.SECURITY_PSK:
+            case WPA_INDEX:
                 config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
                 config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
                 if (mPassword.length() != 0) {
@@ -90,6 +101,15 @@
                     config.preSharedKey = password;
                 }
                 return config;
+
+            case WPA2_INDEX:
+                config.allowedKeyManagement.set(KeyMgmt.WPA2_PSK);
+                config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
+                if (mPassword.length() != 0) {
+                    String password = mPassword.getText().toString();
+                    config.preSharedKey = password;
+                }
+                return config;
         }
         return null;
     }
@@ -116,15 +136,10 @@
 
         if (mWifiConfig != null) {
             mSsid.setText(mWifiConfig.SSID);
-            switch (mSecurityType) {
-              case AccessPoint.SECURITY_NONE:
-                  mSecurity.setSelection(OPEN_INDEX);
-                  break;
-              case AccessPoint.SECURITY_PSK:
-                  String str = mWifiConfig.preSharedKey;
-                  mPassword.setText(str);
-                  mSecurity.setSelection(WPA_INDEX);
-                  break;
+            mSecurity.setSelection(mSecurityTypeIndex);
+            if (mSecurityTypeIndex == WPA_INDEX ||
+                    mSecurityTypeIndex == WPA2_INDEX) {
+                  mPassword.setText(mWifiConfig.preSharedKey);
             }
         }
 
@@ -141,7 +156,8 @@
 
     private void validate() {
         if ((mSsid != null && mSsid.length() == 0) ||
-                   (mSecurityType == AccessPoint.SECURITY_PSK && mPassword.length() < 8)) {
+                   (((mSecurityTypeIndex == WPA_INDEX) || (mSecurityTypeIndex == WPA2_INDEX))&&
+                        mPassword.length() < 8)) {
             getButton(BUTTON_SUBMIT).setEnabled(false);
         } else {
             getButton(BUTTON_SUBMIT).setEnabled(true);
@@ -167,10 +183,7 @@
 
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        if(position == OPEN_INDEX)
-            mSecurityType = AccessPoint.SECURITY_NONE;
-        else
-            mSecurityType = AccessPoint.SECURITY_PSK;
+        mSecurityTypeIndex = position;
         showSecurityFields();
         validate();
     }
@@ -180,7 +193,7 @@
     }
 
     private void showSecurityFields() {
-        if (mSecurityType == AccessPoint.SECURITY_NONE) {
+        if (mSecurityTypeIndex == OPEN_INDEX) {
             mView.findViewById(R.id.fields).setVisibility(View.GONE);
             return;
         }
diff --git a/src/com/android/settings/wifi/WifiApSettings.java b/src/com/android/settings/wifi/WifiApSettings.java
index 7336c6c..ddc3c5c 100644
--- a/src/com/android/settings/wifi/WifiApSettings.java
+++ b/src/com/android/settings/wifi/WifiApSettings.java
@@ -41,9 +41,6 @@
     private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
     private static final int CONFIG_SUBTEXT = R.string.wifi_tether_configure_subtext;
 
-    private static final int OPEN_INDEX = 0;
-    private static final int WPA_INDEX = 1;
-
     private static final int DIALOG_AP_SETTINGS = 1;
 
     private String[] mSecurityType;
@@ -81,12 +78,12 @@
             final String s = activity.getString(
                     com.android.internal.R.string.wifi_tether_configure_ssid_default);
             mCreateNetwork.setSummary(String.format(activity.getString(CONFIG_SUBTEXT),
-                                                    s, mSecurityType[OPEN_INDEX]));
+                                                    s, mSecurityType[WifiApDialog.OPEN_INDEX]));
         } else {
+            int index = WifiApDialog.getSecurityTypeIndex(mWifiConfig);
             mCreateNetwork.setSummary(String.format(activity.getString(CONFIG_SUBTEXT),
                                       mWifiConfig.SSID,
-                                      mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
-                                      mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
+                                      mSecurityType[index]));
         }
     }
 
@@ -138,10 +135,10 @@
                 } else {
                     mWifiManager.setWifiApConfiguration(mWifiConfig);
                 }
+                int index = WifiApDialog.getSecurityTypeIndex(mWifiConfig);
                 mCreateNetwork.setSummary(String.format(getActivity().getString(CONFIG_SUBTEXT),
                             mWifiConfig.SSID,
-                            mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
-                            mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
+                            mSecurityType[index]));
             }
         }
     }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 750e168..7437317 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -159,7 +159,7 @@
             mSsidView.addTextChangedListener(this);
             mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
             mSecuritySpinner.setOnItemSelectedListener(this);
-            if (context instanceof WifiSettingsForSetupWizardXL) {
+            if (mInXlSetupWizard) {
                 // We want custom layout. The content must be same as the other cases.
                 mSecuritySpinner.setAdapter(
                         new ArrayAdapter<String>(context, R.layout.wifi_setup_custom_list_item_1,
@@ -173,9 +173,6 @@
             mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
             mIpSettingsSpinner.setOnItemSelectedListener(this);
             mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
-            // disable proxy UI until we have better app support
-            mProxySettingsSpinner.setVisibility(View.GONE);
-            mView.findViewById(R.id.proxy_settings_title).setVisibility(View.GONE);
             mProxySettingsSpinner.setOnItemSelectedListener(this);
 
             ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
@@ -424,7 +421,13 @@
             if (!InetAddress.isNumeric(gateway)) {
                 return R.string.wifi_ip_settings_invalid_gateway;
             }
-            linkProperties.setGateway(InetAddress.getByName(gateway));
+            InetAddress gatewayAddr;
+            try {
+                gatewayAddr = InetAddress.getByName(gateway);
+            } catch (UnknownHostException e) {
+                return R.string.wifi_ip_settings_invalid_gateway;
+            }
+            linkProperties.addGateway(gatewayAddr);
 
             String dns = mDns1View.getText().toString();
             if (!InetAddress.isNumeric(dns)) {
@@ -485,16 +488,16 @@
     }
 
     private void showSecurityFields() {
+        if (mInXlSetupWizard) {
+            // Note: XL SetupWizard won't hide "EAP" settings here.
+            if (!((WifiSettingsForSetupWizardXL)mConfigUi.getContext()).initSecurityFields(mView,
+                        mAccessPointSecurity)) {
+                return;
+            }
+        }
         if (mAccessPointSecurity == AccessPoint.SECURITY_NONE) {
             mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
             return;
-        } else if (mAccessPointSecurity == AccessPoint.SECURITY_EAP && mInXlSetupWizard) {
-            // In SetupWizard for XLarge screen, we don't have enough space for showing
-            // configurations needed for EAP. We instead disable the whole feature there and let
-            // users configure those networks after the setup.
-            mView.findViewById(R.id.eap_not_supported).setVisibility(View.VISIBLE);
-            mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
-            return;
         }
         mView.findViewById(R.id.security_fields).setVisibility(View.VISIBLE);
 
@@ -594,9 +597,10 @@
                     mNetworkPrefixLengthView.setText(Integer.toString(linkAddress
                             .getNetworkPrefixLength()));
                 }
-                InetAddress gateway = linkProperties.getGateway();
-                if (gateway != null) {
-                    mGatewayView.setText(linkProperties.getGateway().getHostAddress());
+
+                Iterator<InetAddress>gateways = linkProperties.getGateways().iterator();
+                if (gateways.hasNext()) {
+                    mGatewayView.setText(gateways.next().getHostAddress());
                 }
                 Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator();
                 if (dnsIterator.hasNext()) {
@@ -621,6 +625,7 @@
         }
 
         if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_STATIC) {
+            mView.findViewById(R.id.proxy_warning_limited_support).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.proxy_fields).setVisibility(View.VISIBLE);
             if (mProxyHostView == null) {
                 mProxyHostView = (TextView) mView.findViewById(R.id.proxy_hostname);
@@ -636,6 +641,7 @@
                 }
             }
         } else {
+            mView.findViewById(R.id.proxy_warning_limited_support).setVisibility(View.GONE);
             mView.findViewById(R.id.proxy_fields).setVisibility(View.GONE);
         }
     }
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index caafabc..ebc5567 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -43,13 +43,14 @@
 
 import java.util.Collection;
 import java.util.EnumMap;
+import java.util.List;
 
 /**
  * WifiSetings Activity specific for SetupWizard with X-Large screen size.
  */
 public class WifiSettingsForSetupWizardXL extends Activity implements OnClickListener {
     private static final String TAG = "SetupWizard";
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = true;
 
     private static final EnumMap<DetailedState, DetailedState> stateMap =
             new EnumMap<DetailedState, DetailedState>(DetailedState.class);
@@ -88,6 +89,7 @@
     private CharSequence mEditingTitle;
 
     private ProgressBar mProgressBar;
+    private View mTopDividerNoProgress;
     private WifiSettings mWifiSettings;
 
     private Button mAddNetworkButton;
@@ -99,12 +101,19 @@
 
     private Button mConnectButton;
 
+    /**
+     * View enclosing {@link WifiSettings}.
+     */
+    private View mWifiSettingsFragmentLayout;
     private View mConnectingStatusLayout;
     private TextView mConnectingStatusView;
 
-    // true when a user already pressed "Connect" button and waiting for connection.
-    // Also true when the device is already connected to a wifi network on launch.
-    private boolean mAfterConnectAction;
+    private static final int SCREEN_STATE_DISCONNECTED = 0;
+    private static final int SCREEN_STATE_EDITING = 1;
+    private static final int SCREEN_STATE_CONNECTING = 2;
+    private static final int SCREEN_STATE_CONNECTED = 3;
+
+    private int mScreenState = SCREEN_STATE_DISCONNECTED;
 
     private WifiConfigUiForSetupWizardXL mWifiConfig;
 
@@ -155,14 +164,19 @@
     }
 
     public void setup() {
-        final View layoutRoot = findViewById(R.id.layout_root);
-        layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
+        if (getIntent().getBooleanExtra("firstRun", false)) {
+            final View layoutRoot = findViewById(R.id.layout_root);
+            layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
+        }
 
         mTitleView = (TextView)findViewById(R.id.wifi_setup_title);
         mProgressBar = (ProgressBar)findViewById(R.id.scanning_progress_bar);
         mProgressBar.setMax(2);
+        mTopDividerNoProgress = findViewById(R.id.top_divider_no_progress);
 
+        mProgressBar.setVisibility(View.VISIBLE);
         mProgressBar.setIndeterminate(true);
+        mTopDividerNoProgress.setVisibility(View.GONE);
 
         mAddNetworkButton = (Button)findViewById(R.id.wifi_setup_add_network);
         mAddNetworkButton.setOnClickListener(this);
@@ -178,6 +192,7 @@
         mTopPadding = findViewById(R.id.top_padding);
         mWifiConfigPadding = findViewById(R.id.wifi_config_padding);
 
+        mWifiSettingsFragmentLayout = findViewById(R.id.wifi_settings_fragment_layout);
         mConnectingStatusLayout = findViewById(R.id.connecting_status_layout);
         mConnectingStatusView = (TextView) findViewById(R.id.connecting_status);
 
@@ -189,9 +204,7 @@
 
     private void restoreFirstButtonVisibilityState() {
         showDefaultTitle();
-        // TODO: uncomment this when the layout for it is ready. Note that we also have to remove
-        // android:visibility="gone" in xml then.
-        // mAddNetworkButton.setVisibility(View.VISIBLE);
+        mAddNetworkButton.setVisibility(View.VISIBLE);
         mRefreshButton.setVisibility(View.VISIBLE);
         mSkipOrNextButton.setVisibility(View.VISIBLE);
         mConnectButton.setVisibility(View.GONE);
@@ -249,70 +262,92 @@
             // Let users know the device is working correctly though currently there's
             // no visible network on the list.
             if (mWifiSettings.getAccessPointsCount() == 0) {
+                mProgressBar.setVisibility(View.VISIBLE);
                 mProgressBar.setIndeterminate(true);
+                mTopDividerNoProgress.setVisibility(View.GONE);
             } else {
                 // Users already connected to a network, or see available networks.
+                mProgressBar.setVisibility(View.GONE);
                 mProgressBar.setIndeterminate(false);
+                mTopDividerNoProgress.setVisibility(View.VISIBLE);
             }
             break;
         }
         case CONNECTING: {
-            showConnectingStatus();
+            if (mScreenState != SCREEN_STATE_DISCONNECTED &&
+                    mScreenState != SCREEN_STATE_CONNECTED) {
+                showConnectingState();
+            }
             break;
         }
         case CONNECTED: {
-            hideSoftwareKeyboard();
-            setPaddingVisibility(View.VISIBLE);
-
-            // If the device is already connected to a wifi without users' "Connect" request,
-            // this can be false here. We want to treat it as "after connect action".
-            mAfterConnectAction = true;
-
-            trySetBackground(R.drawable.setups_bg_complete);
-
-            mProgressBar.setIndeterminate(false);
-            mProgressBar.setProgress(2);
-
-            showConnectedTitle();
-            mConnectingStatusView.setText(R.string.wifi_setup_description_connected);
-            mConnectButton.setVisibility(View.GONE);
-            mAddNetworkButton.setVisibility(View.GONE);
-            mRefreshButton.setVisibility(View.GONE);
-            mBackButton.setVisibility(View.VISIBLE);
-            mBackButton.setText(R.string.wifi_setup_back);
-            mSkipOrNextButton.setVisibility(View.VISIBLE);
-            mSkipOrNextButton.setEnabled(true);
-            mHandler.removeCallbacks(mSkipButtonEnabler);
+            showConnectedState();
             break;
         }
         default:  // DISCONNECTED, FAILED
-            showDisconnectedStatus(Summary.get(this, state));
+            if (mScreenState != SCREEN_STATE_CONNECTED) {
+                showDisconnectedState(Summary.get(this, state));
+            }
             break;
         }
         mPreviousState = state;
     }
 
-    private void showDisconnectedStatus(String stateString) {
+    private void showDisconnectedState(String stateString) {
+        mProgressBar.setVisibility(View.GONE);
         mProgressBar.setIndeterminate(false);
         mProgressBar.setProgress(0);
+        mTopDividerNoProgress.setVisibility(View.VISIBLE);
 
         mAddNetworkButton.setEnabled(true);
         mRefreshButton.setEnabled(true);
     }
 
-    private void showConnectingStatus() {
+    private void showConnectingState() {
+        mScreenState = SCREEN_STATE_CONNECTING;
+
         mBackButton.setVisibility(View.VISIBLE);
         // We save this title and show it when authentication failed.
         mEditingTitle = mTitleView.getText();
         showConnectingTitle();
+        mProgressBar.setVisibility(View.VISIBLE);
         mProgressBar.setIndeterminate(false);
         mProgressBar.setProgress(1);
+        mTopDividerNoProgress.setVisibility(View.GONE);
 
-        // We may enter "Connecting" status during editing password again (if the Wifi module
-        // tries to (re)connect a network.)
-        if (mAfterConnectAction) {
-            setPaddingVisibility(View.VISIBLE);
-        }
+        setPaddingVisibility(View.VISIBLE);
+    }
+
+    private void showConnectedState() {
+        // Once we show "connected" screen, we won't change it even when the device becomes
+        // disconnected afterwards. We keep the state unless a user explicitly cancel it
+        // (by pressing "back" button).
+        mScreenState = SCREEN_STATE_CONNECTED;
+
+        hideSoftwareKeyboard();
+        setPaddingVisibility(View.VISIBLE);
+
+        trySetBackground(R.drawable.setups_bg_complete);
+
+        mProgressBar.setVisibility(View.VISIBLE);
+        mProgressBar.setIndeterminate(false);
+        mProgressBar.setProgress(2);
+        mTopDividerNoProgress.setVisibility(View.GONE);
+
+        showConnectedTitle();
+
+        mWifiSettingsFragmentLayout.setVisibility(View.GONE);
+        mConnectingStatusLayout.setVisibility(View.VISIBLE);
+
+        mConnectingStatusView.setText(R.string.wifi_setup_description_connected);
+        mConnectButton.setVisibility(View.GONE);
+        mAddNetworkButton.setVisibility(View.GONE);
+        mRefreshButton.setVisibility(View.GONE);
+        mBackButton.setVisibility(View.VISIBLE);
+        mBackButton.setText(R.string.wifi_setup_back);
+        mSkipOrNextButton.setVisibility(View.VISIBLE);
+        mSkipOrNextButton.setEnabled(true);
+        mHandler.removeCallbacks(mSkipButtonEnabler);
     }
 
     private void showDefaultTitle() {
@@ -364,7 +399,9 @@
     }
 
     private void showScanningStatus() {
+        mProgressBar.setVisibility(View.VISIBLE);
         mProgressBar.setIndeterminate(true);
+        mTopDividerNoProgress.setVisibility(View.GONE);
         mAddNetworkButton.setEnabled(false);
         mRefreshButton.setEnabled(false);
     }
@@ -395,7 +432,7 @@
         // We don't want to keep scanning Wi-Fi networks during users' configuring one network.
         mWifiSettings.pauseWifiScan();
 
-        findViewById(R.id.wifi_setup).setVisibility(View.GONE);
+        mWifiSettingsFragmentLayout.setVisibility(View.GONE);
         mConnectingStatusLayout.setVisibility(View.GONE);
         final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
         parent.setVisibility(View.VISIBLE);
@@ -406,9 +443,6 @@
         mConnectButton.setTag(null);
         if (selectedAccessPoint == null) {  // "Add network" flow
             showAddNetworkTitle();
-            if (mWifiConfig != null) {
-                mWifiConfig.getView().findViewById(R.id.wifi_general_info).setVisibility(View.GONE);
-            }
             mConnectButton.setVisibility(View.VISIBLE);
             mConnectButton.setTag(CONNECT_BUTTON_TAG_ADD_NETWORK);
 
@@ -423,8 +457,7 @@
             showEditingTitle();
             showEditingButtonState();
             if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
-                mConnectButton.setVisibility(View.GONE);
-                mBackButton.setText(R.string.wifi_setup_back);
+                onEapNetworkSelected();
             } else {
                 mConnectButton.setVisibility(View.VISIBLE);
 
@@ -437,6 +470,47 @@
         }
     }
 
+    /**
+     * Called before security fields are correctly set by WifiConfigController.
+     *
+     * @param view security field view
+     * @param accessPointSecurity type of security. e.g. AccessPoint.SECURITY_NONE
+     * @return true when it is ok for the caller to init security fields. false when
+     * all security fields are managed by this method, and thus the caller shouldn't touch them.
+     */
+    /* package */ boolean initSecurityFields(View view, int accessPointSecurity) {
+        // Reset all states tweaked below.
+        view.findViewById(R.id.eap_not_supported).setVisibility(View.GONE);
+        view.findViewById(R.id.eap_not_supported_for_add_network).setVisibility(View.GONE);
+        view.findViewById(R.id.ssid_text).setVisibility(View.VISIBLE);
+        view.findViewById(R.id.ssid_layout).setVisibility(View.VISIBLE);
+
+        if (accessPointSecurity == AccessPoint.SECURITY_EAP) {
+            hideSoftwareKeyboard();
+
+            // In SetupWizard for XLarge screen, we don't have enough space for showing
+            // configurations needed for EAP. We instead disable the whole feature there and let
+            // users configure those networks after the setup.
+            if (view.findViewById(R.id.type).getVisibility() == View.VISIBLE) {
+                view.findViewById(R.id.eap_not_supported_for_add_network)
+                .setVisibility(View.VISIBLE);
+            } else {
+                view.findViewById(R.id.eap_not_supported).setVisibility(View.VISIBLE);
+            }
+            view.findViewById(R.id.security_fields).setVisibility(View.GONE);
+            view.findViewById(R.id.ssid_text).setVisibility(View.GONE);
+            view.findViewById(R.id.ssid_layout).setVisibility(View.GONE);
+            onEapNetworkSelected();
+            return false;
+        }
+        return true;
+    }
+
+    /* package */ void onEapNetworkSelected() {
+        mConnectButton.setVisibility(View.GONE);
+        mBackButton.setText(R.string.wifi_setup_back);
+    }
+
     private void showEditingButtonState() {
         mSkipOrNextButton.setVisibility(View.GONE);
         mAddNetworkButton.setVisibility(View.GONE);
@@ -446,7 +520,7 @@
 
     // May be called when user press "connect" button in WifiDialog
     /* package */ void onConnectButtonPressed() {
-        mAfterConnectAction = true;
+        mScreenState = SCREEN_STATE_CONNECTING;
 
         trySetBackground(R.drawable.setups_bg_wifi);
 
@@ -456,7 +530,7 @@
         // and the user still sees "not connected" message for a while, which looks strange.
         // We instead manually show "connecting" message before the system gets actual
         // "connecting" message from Wi-Fi module.
-        showConnectingStatus();
+        showConnectingState();
 
         // Might be better to delay showing this button.
         mBackButton.setVisibility(View.VISIBLE);
@@ -498,9 +572,9 @@
     private void onBackButtonPressed() {
         trySetBackground(R.drawable.setups_bg_default);
 
-        if (mAfterConnectAction) {
+        if (mScreenState == SCREEN_STATE_CONNECTING || mScreenState == SCREEN_STATE_CONNECTED) {
             if (DEBUG) Log.d(TAG, "Back button pressed after connect action.");
-            mAfterConnectAction = false;
+            mScreenState = SCREEN_STATE_DISCONNECTED;
 
             // When a user press "Back" button after pressing "Connect" button, we want to cancel
             // the "Connect" request and refresh the whole wifi status.
@@ -509,6 +583,23 @@
             mSkipOrNextButton.setEnabled(true);
             changeNextButtonState(false);  // Skip
 
+            // Wifi list becomes empty for a moment. We show "scanning" effect to a user so that
+            // he/she won't be astonished there. This stops once the scan finishes.
+            mProgressBar.setVisibility(View.VISIBLE);
+            mProgressBar.setIndeterminate(true);
+            mTopDividerNoProgress.setVisibility(View.GONE);
+
+            // Remembered networks may be re-used during SetupWizard, which confuse users.
+            // We force the module to forget them to reduce UX complexity
+            final List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
+            for (WifiConfiguration config : configs) {
+                if (DEBUG) {
+                    Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)",
+                            config.SSID, config.networkId));
+                }
+                mWifiManager.forgetNetwork(config.networkId);
+            }
+
             refreshAccessPoints(true);
         } else { // During user's Wifi configuration.
             mWifiSettings.resumeWifiScan();
@@ -520,7 +611,7 @@
             mSkipOrNextButton.setEnabled(true);
         }
 
-        findViewById(R.id.wifi_setup).setVisibility(View.VISIBLE);
+        mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
         mConnectingStatusLayout.setVisibility(View.GONE);
         final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
         parent.removeAllViews();
@@ -548,7 +639,9 @@
         // If we already show some of access points but the bar still shows "scanning" state, it
         // should be stopped.
         if (mProgressBar.isIndeterminate() && accessPoints.size() > 0) {
+            mProgressBar.setVisibility(View.GONE);
             mProgressBar.setIndeterminate(false);
+            mTopDividerNoProgress.setVisibility(View.VISIBLE);
             mAddNetworkButton.setEnabled(true);
             mRefreshButton.setEnabled(true);
         }
@@ -565,7 +658,7 @@
                 ((Integer)tag == CONNECT_BUTTON_TAG_ADD_NETWORK)) {
             // In "Add network" flow, we won't get DetaledState available for changing ProgressBar
             // state. Instead we manually show previous status here.
-            showDisconnectedStatus(Summary.get(this, mPreviousState));
+            showDisconnectedState(Summary.get(this, mPreviousState));
         } else {
             showScanningStatus();
         }
@@ -593,7 +686,8 @@
      * Called once when Authentication failed.
      */
     private void onAuthenticationFailure() {
-        mAfterConnectAction = false;
+        mScreenState = SCREEN_STATE_EDITING;
+
         mSkipOrNextButton.setVisibility(View.GONE);
         mConnectButton.setVisibility(View.VISIBLE);
         mConnectButton.setEnabled(true);