diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cfa92b0..517d81d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -450,7 +450,6 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
-                <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -464,6 +463,19 @@
                 android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
         </activity>
 
+        <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
+                  android:label="@string/user_dict_settings_titlebar"
+                  android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
+                  android:windowSoftInputMode="stateVisible"
+                  android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
+                <action android:name="com.android.settings.USER_DICTIONARY_EDIT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UserDictionarySettings"
                 android:label="@string/user_dict_settings_titlebar"
diff --git a/proguard.flags b/proguard.flags
index 6d41d17..a07b2ec 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -12,3 +12,7 @@
 -keep class com.android.settings.accounts.*
 -keep class com.android.settings.fuelgauge.*
 
+# Keep click responders
+-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
+  *** onClick*(...);
+}
diff --git a/res/drawable-hdpi/app_gauge.9.png b/res/drawable-hdpi/app_gauge.9.png
deleted file mode 100644
index ac79d21..0000000
--- a/res/drawable-hdpi/app_gauge.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_error.png b/res/drawable-hdpi/ic_sync_error.png
deleted file mode 100644
index 914d44d..0000000
--- a/res/drawable-hdpi/ic_sync_error.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/app_gauge.9.png b/res/drawable-mdpi/app_gauge.9.png
deleted file mode 100644
index f6c7c99..0000000
--- a/res/drawable-mdpi/app_gauge.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_error.png b/res/drawable-mdpi/ic_sync_error.png
deleted file mode 100644
index 2b98bca..0000000
--- a/res/drawable-mdpi/ic_sync_error.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/app_gauge.9.png b/res/drawable-xhdpi/app_gauge.9.png
deleted file mode 100644
index ceb798c..0000000
--- a/res/drawable-xhdpi/app_gauge.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_error.png b/res/drawable-xhdpi/ic_sync_error.png
deleted file mode 100644
index b9a5357..0000000
--- a/res/drawable-xhdpi/ic_sync_error.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
new file mode 100644
index 0000000..e5c58d0
--- /dev/null
+++ b/res/layout/dream_picker_row.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingLeft="2dip"
+    android:gravity="center_vertical">
+
+    <ImageView android:id="@+id/icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:scaleType="fitCenter" />
+
+    <TextView android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:paddingLeft="6dip" />
+        
+</LinearLayout>
+
diff --git a/res/layout/text_description_preference.xml b/res/layout/text_description_preference.xml
index eeaa81b..7d73f58 100644
--- a/res/layout/text_description_preference.xml
+++ b/res/layout/text_description_preference.xml
@@ -24,7 +24,7 @@
         android:id="@+id/summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorSecondary"
         android:padding="16dip" />
 
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
new file mode 100644
index 0000000..1e6b5ac
--- /dev/null
+++ b/res/layout/user_dictionary_add_word.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/user_dict_settings_add_dialog_top"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+  <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+    <com.android.internal.widget.DialogTitle
+          style="?android:attr/windowTitleStyle"
+          android:singleLine="true"
+          android:ellipsize="end"
+          android:layout_width="match_parent"
+          android:layout_height="64dip"
+          android:layout_marginLeft="16dip"
+          android:layout_marginRight="16dip"
+          android:gravity="center_vertical|left"
+          android:text="@string/user_dict_settings_add_dialog_title" />
+    <View android:layout_width="match_parent"
+          android:layout_height="2dip"
+          android:background="@android:color/holo_blue_light" />
+  </LinearLayout>
+
+  <EditText android:id="@+id/user_dictionary_add_word_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|left"
+            android:inputType="textNoSuggestions"
+            android:imeOptions="flagNoFullscreen"
+            android:paddingBottom="10dip"
+            android:layout_marginLeft="8dip"
+            android:layout_marginRight="8dip"
+            android:visibility="visible">
+    <requestFocus/>
+  </EditText>
+
+  <LinearLayout android:id="@+id/user_dict_settings_add_dialog_shortcut_interface"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone" >
+<!-- Shortcut interface. Reactivate when shortcut are supported by the subsystem.
+    <TextView style="?android:attr/textAppearanceSmall"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="8dip"
+              android:text="@string/user_dict_settings_add_shortcut_option_name" />
+    <EditText android:id="@+id/user_dictionary_settings_add_dialog_shortcut"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="8dip"
+              android:layout_marginRight="8dip"
+              android:inputType="textNoSuggestions"
+              android:imeOptions="flagNoFullscreen" />
+-->
+    <TextView android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="8dip"
+              android:text="@string/user_dict_settings_add_locale_option_name" />
+    <Spinner  android:id="@+id/user_dictionary_settings_add_dialog_locale"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="8dip" />
+  </LinearLayout>
+
+  <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:divider="?android:attr/dividerHorizontal"
+                android:showDividers="beginning"
+                android:dividerPadding="0dip">
+    <LinearLayout style="?android:attr/buttonBarStyle"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:measureWithLargestChild="true">
+      <Button android:layout_width="0dip"
+              android:layout_gravity="left"
+              android:layout_weight="1"
+              android:maxLines="2"
+              style="?android:attr/buttonBarButtonStyle"
+              android:textSize="14sp"
+              android:text="@string/cancel"
+              android:layout_height="wrap_content"
+              android:onClick="onClickCancel" />
+      <Button android:id="@+id/user_dictionary_settings_add_dialog_options"
+              android:layout_width="0dip"
+              android:layout_gravity="center_horizontal"
+              android:layout_weight="1"
+              android:maxLines="2"
+              style="?android:attr/buttonBarButtonStyle"
+              android:textSize="14sp"
+              android:text="@string/user_dict_settings_add_dialog_options"
+              android:layout_height="wrap_content"
+              android:onClick="onClickOptions" />
+      <Button android:id="@+id/user_dictionary_settings_add_dialog_manage"
+              android:layout_width="0dip"
+              android:layout_gravity="center_horizontal"
+              android:layout_weight="1"
+              android:maxLines="2"
+              style="?android:attr/buttonBarButtonStyle"
+              android:textSize="14sp"
+              android:text="@string/user_dict_settings_add_dialog_manage"
+              android:layout_height="wrap_content"
+              android:visibility="gone"
+              android:onClick="onClickManage" />
+      <Button android:layout_width="0dip"
+              android:layout_gravity="right"
+              android:layout_weight="1"
+              android:maxLines="2"
+              style="?android:attr/buttonBarButtonStyle"
+              android:textSize="14sp"
+              android:text="@string/user_dict_settings_add_dialog_confirm"
+              android:layout_height="wrap_content"
+              android:onClick="onClickConfirm" />
+    </LinearLayout>
+  </LinearLayout>
+</LinearLayout>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 4408f01..dab3c23 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Verwyderbare SD-kaart"</item>
     <item msgid="4498124044785815005">"Laat die stelsel besluit"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Af"</item>
-    <item msgid="4804571292609523335">"Vibreer"</item>
-    <item msgid="595707141547423573">"Demp"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Altyd"</item>
+    <item msgid="6293147072807231256">"Nooit"</item>
+    <item msgid="1276641209451816572">"Net in stilmodus"</item>
+    <item msgid="8418930333779132418">"Net wanneer nie in stilmodus nie"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7497619..86fdb37 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Die gasheernaam wat jy ingevoer het, is nie geldig nie."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Die uitsluitingslys wat jy ingevoer het, is nie behoorlik geformateer nie. Voer asseblief \'n kommageskeide lys uitgeslote domeine in."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Jy moet die poortveld voltooi."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Jy moet die poortveld voltooi."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Die poortveld moet leeg wees as die gasheerveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Die poort wat jy ingevoer het, is nie geldig nie."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Die HTTP-instaanbediener word deur die blaaier gebruik, maar kan nie deur die ander programme gebruik word nie."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vereis \'n numeriese PIN of wagwoord om jou tablet te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vereis \'n numeriese PIN of wagwoord om jou foon te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Geënkripteer"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media- en ander lêers enkripteer. Sodra jy jou tablet enkripteer moet jy \'n numeriese PIN of wagwoord invoer om dit te dekripteer elke keer as jy dit aanskakel: jy kan nie enkripsie ontdoen nie, tensy jy \'n fabrieksterugstelling doen, wat al jou data sal uitvee."\n\n"Enkripsie duur \'n uur of meer. Jy moet begin met \'n gelaaide battery en jou tablet ingeprop hou totdat enkripsie voltooi is. As jy die enkripsieproses onderbreek sal jy sommige of al jou data verloor."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media- en ander lêers enkripteer. Sodra jy jou foon enkripteer moet jy \'n numeriese PIN of wagwoord invoer om dit te dekripteer elke keer as jy dit aanskakel: jy kan nie enkripsie ontdoen nie, tensy jy \'n fabrieksterugstelling doen, wat al jou data sal uitvee."\n\n"Enkripsie duur \'n uur of meer. Jy moet begin met \'n gelaaide battery en jou foon ingeprop hou totdat enkripsie voltooi is. As jy die enkripsieproses onderbreek sal jy sommige of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media- en ander lêers enkripteer. Sodra jy jou tablet enkripteer, moet jy \'n numeriese PIN of wagwoord invoer om dit te dekripteer elke keer as jy dit aanskakel: jy kan nie jou tablet dekripteer nie, behalwe deur die uitvoering van \'n fabriekterugstelling, wat al jou data sal uitvee."\n\n"Enkripsie neem een uur of meer. Jy moet begin met \'n gelaaide battery en jou tablet ingeprop hou totdat enkripsie voltooi is. As jy die enkripsieproses onderbreek, sal jy sommige of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media- en ander lêers enkripteer. Sodra jy jou foon enkripteer, moet jy \'n numeriese PIN of wagwoord invoer om dit te dekripteer elke keer as jy dit aanskakel: jy kan nie jou foon dekripteer nie, behalwe deur die uitvoering van \'n fabriekterugstelling, wat al jou data sal uitvee."\n\n"Enkripsie neem een uur of meer. Jy moet begin met \'n gelaaide battery en jou foon ingeprop hou totdat enkripsie voltooi is. As jy die enkripsieproses onderbreek, sal jy sommige of al jou data verloor."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripteer tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripteer foon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laai jou battery en probeer weer."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Prop jou laaier in en probeer weer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen skermslot-PIN of -wagwoord nie"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Jy moet \'n PIN of wagwoord vir die skermslot stel voordat jy met enkripsie kan begin."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Jy moet \'n PIN of wagwoord vir die skermslot stel, voordat jy met enkripsie kan begin."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bevestig enkripsie"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Enkripteer tablet? Hierdie handeling kan nie ontdoen word nie, en as jy dit onderbreek, sal jy data verloor. Enkripsie duur \'n uur of meer, waartydens die tablet \'n paar keer sal herbegin."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Enkripteer foon? Hierdie handeling kan nie ontdoen word nie, en as jy dit onderbreek, sal jy data verloor. Enkripsie duur \'n uur of meer, waartydens die foon \'n paar keer sal herbegin."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer weer oor <xliff:g id="DELAY">^1</xliff:g> sekondes."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Voer jou wagwoord in"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsie onsuksesvol"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Enkripsie is onderbreek en kan nie voltooi nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. "\n\n"Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat ntot jou Google-rekening was gerugsteun te herstel."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Enkripsie is onderbreek en kan nie voltooi nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. "\n\n"Om gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, het jy \'n geleentheid om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. "\n\n" Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. "\n\n"Om gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Kies skermslot"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Kies rugsteunslot"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skermslot"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Skuif"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Gesigslot"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Beveilig met patroon"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Beveilig met PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Beveilig met wagwoord"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patroon"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Wagwoord"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Skakel skermslot af"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Verwyder ontsluitpatroon"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Verwyder ontsluit-PIN"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musiekeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Luiervolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreer wanneer stil"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibreer en lui"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibreer"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Verstek kennisgewing"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Flikker kennisgewing-liggie"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Luitoon"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Foon nie gedok nie"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Instellings vir die aangehegte dok"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok nie gevind nie"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Jy moet die tablet dok voordat jy dokoudio opstel."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Jy moet die foon dok voordat jy die dokoudio opstel."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Jy moet die tablet dok voordat jy die dok-oudio opstel."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Jy moet die foon dok voordat jy die dok-oudio opstel."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dok-insteekklank"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Speel klank wanneer tablet op dok geplaas of daarvan verwyder word"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Speel klank wanneer foon in dok gesit of uitgehaal word"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vee al jou persoonlike inligting en afgelaaide programme uit? Jy kan nie hierdie handeling ontdoen nie!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vee alles uit"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken jou ontsluitpatroon"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Jy moet jou ontsluitpatroon teken om jou foon se fabrieksterugstelling te bevestig."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Jy moet jou ontsluitpatroon teken om \'n fabrieksterugstelling te bevestig."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Omdat die Stelsel Skoonmaak-diens nie beskikbaar was nie, is geen terugstel gedoen nie."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Stel terug?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vee USB-berging uit"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vee SD-kaart uit, wat alle lêers wat daar gestoor word, sal uitvee? Handeling kan nie ontdoen word nie."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Vee alles uit"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teken jou ontsluitpatroon"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die USB-berging wil uitvee."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die SD-kaart wil uitvee."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die USB-berging wil uitvee."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die SD-kaart wil uitvee."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellings"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Stel stemboodskapdiens, oproepaanstuur, oproep wag, beller-ID op"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-verbinding"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Beveilig jou tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Beveilig jou foon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Beskerm jou tablet teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Gly met jou vinger om die kolletjies in enige volgorde te verbind op die volgende skerm. Jy moet ten minste vier kolletjies verbind. "\n\n"Reg om te begin? Raak “Volgende”."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskerm jou tablet teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Laat gly jou vinger oor die volgende skerm om die kolletjies in enige volgorde te verbind. Jy moet ten minste vier kolletjies verbind. "\n\n"Reg om te begin? Raak Volgende."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskerm jou foon teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Gly met jou vinger om ten minste vier kolletjies in enige volgorde op die volgende skerm te verbind. "\n\n"Gereed? Raak \"Volgende\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Bestuur programme"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Bestuur en verwyder geïnstalleerde programme"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Stelsel"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Groot teks"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Krag-knoppie beëindig oproep"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Sê wagwoorde hardop"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Ontdek-met-raak"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Wanneer ontdek-met-raak aangeskakel is, kan jy beskrywings wat onder jou vinger is, sien of hoor."\n\n" Hierdie kenmerk is vir siggestremde gebruikers."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Raak-en-hou-vertraging"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen dienste geïnstalleer nie"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Soek jy \'n skermleser?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bied gesproke terugvoer om blindes en gebruikers met swak sig te help. Wil jy dit gratis vanaf Android Market installeer?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Installeer webskripte?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Wil jy toelaat dat programme skripte van Google installeer wat hul webinhoud meer toeganklik sal maak?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Hierdie funksie verander die manier hoe jou toestel reageer op aanraking. Skakel aan?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beskrywing verskaf nie."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Eiebewysberging is uitgevee."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Eiebewysberging kon nie uitgevee word nie."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Eiebewysberging is geaktiveer."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Jy moet \'n PIN of wagwoord vir die sluitskerm stel voordat jy eiebewysberging kan gebruik."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Jy moet \'n sluitskerm-PIN of -wagwoord stel voordat jy eiebewysberging kan gebruik."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Noodtoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Stel gedrag wanneer \'n noodoproep gemaak word"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Rugsteun en terugstelling"</string>
@@ -1419,7 +1417,7 @@
     <string name="header_account_settings" msgid="5382475087121880626">"Rekeninginstellings"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Verwyder rekening"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"Voeg \'n rekening by"</string>
-    <string name="finish_button_label" msgid="481587707657751116">"Voltooi"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Maak klaar"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Verwyder rekening?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Verwydering van hierdie rekening sal ook al sy boodskappe, kontakte en ander data van die tablet uitvee."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Verwydering van hierdie rekening sal ook al sy boodskappe, kontakte en ander data van die foon uitvee."</string>
@@ -1525,8 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec voorafgedeelde sleutel"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-gebruikersertifikaat"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA-sertifikaat"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"Wys gevorderde opsies"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-soekdomeine"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-bedieners (bv. 8.8.8.8)"</string>
@@ -1536,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Stoor rekeninginligting"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(nie gebruik nie)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(moenie bediener verifieer nie)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"Kanselleer"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Stoor"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Koppel"</string>
@@ -1561,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Maak klaar"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Slaan tutoriaal oor"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Les 1: Ontdek die skerm"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Nadat jy \"Verken deur aanraking\" aangeskakel het, kan jy die skerm raak om te leer wat… onder jou vinger is. Bv., die huidige skerm bevat programikone. Kry een van hulle deur die  die skerm te raak en met jou vinger rond te gly."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Wanneer \'Verken deur aanraking\' aangeskakel is, kan jy die skerm raak om uit te vind wat onder jou vinger is. Byvoorbeeld, die huidige skerm bevat programikone. Om een te vind, raak die skerm en laat gly jou vinger daaroor."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Mooi so. Hou aan om met jou vinger oor die skerm te gly totdat jy ten minste nog een ikoon kry."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Om iets te aktiveer waaraan jy raak, tik daarop. Gly jou vinger totdat jy die ikoon vir die <xliff:g id="APP_NAME">%s</xliff:g> kry. Tik dan die ikoon een keer om dit te aktiveer."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jou vinger raak nou aan die <xliff:g id="APP_NAME">%s</xliff:g>-ikoon. Tik een keer om die ikoon te aktiveer."</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index b78eff2..d9e631b 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"ተወጋጅ SD ካርድ"</item>
     <item msgid="4498124044785815005">"ስርዓቱ ይወስን"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"ጠፍቷል"</item>
-    <item msgid="4804571292609523335">"ንዘር"</item>
-    <item msgid="595707141547423573">"ድምፀ-ከል አድርግ"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"ዘወትር"</item>
+    <item msgid="6293147072807231256">"በፍፁም"</item>
+    <item msgid="1276641209451816572">"በፀጥታ ሁነታ ውስጥ ብቻ"</item>
+    <item msgid="8418930333779132418">"በፀጥታ ሁነታ ውስጥ ሳይሆን ብቻ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d40f08c..137554e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"እሺ"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"የተየብከው የአስተናጋጅ ስም ትክክል አይደለም።"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"የተየብካቸው ከቁጥር የማይገቡ ዝርዝሮች በትክክል አልተቀረፁም። እባክህ በነጠላ ሰረዝ የተለዩትን ከቁጥር የማይገቡ ጎራ ዝርዝሮችን አስገባ።"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"የወደብ መስኩን ማጠናቀቅ አለብዎ።"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"የወደብ መስኩን ማጠናቀቅ ያስፈልግሃል።"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"የአስተናጋጁ መስክ ባዶ ከሆነ የወደብ መስኩ ባዶ መሆን አለበት።"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"የተየብከው ወደብ ትክክል አይደለም።"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"አሳሹ የHTTP ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ጡባዊዎን ባበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ስልክዎን ባበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ተመሳጥሯል"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"መለያዎችህን፣ ቅንብሮችህን፣ የወረዱ መተግበሪያዎችህን እና የውሂብ፣ ማህደረ መረጃ እና ሌሎች ፋይሎችን ማመስጠር ትችላለህ። ጡባዊህን አንድ ጊዜ ካመሰጠርክ፣ ጡባዊህን  ፒን ወይም ይለፍ ቃልማስገባት አለብህ። ከፋብሪካ የውሂብ ድጋሚ አስጀምር፣ ውሂብህን በሙሉ ከመሰረዝ በስተቀር ስልክህን አለማመስጠር አትችልም። "\n\n"እስኪጠናቀቅ ጡባዊህ መሰካት አለበት። የማመስጠሩን ሂደት ካቋረጥከው አንዱን ወይም ሁሉንም ውሂብህን ታጣለህ።"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"መለያዎችዎን፣ ቅንብሮችህን፣ የወረዱ መተግበሪያዎችህን እና የውሂብ፣ ማህደረ መረጃ እና ሌሎች ፋይሎች ማመስጠር ትችላለህ። ስልክህን አንድ ጊዜ ካመሰጠርክ፣ ስልኩን ባበራህ ቁጥር የቁጥር ፒን ወይም ይለፍ ቃልማስገባት አለብህ። ከፋብሪካ የውሂብ ድጋሚ አስጀምር፣ ውሂብህን በሙሉ ከመሰረዝ በስተቀር ስልክህን አለማመስጠር አይችሉም። "\n\n" ማመስጠር1 ሰዓት ወይም ከዛ በላይ ይወስዳል። ኃይሉ በተሞላ ባትሪ መጀመር እና ማመስጠሩ እስኪጠናቀቅ ስልክህ መሰካት አለበት። የማመስጠሩን ሂደት ካቋረጥከው አንዱን ወይም ሁሉንም ውሂብህን ታጣለህ።"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"መለያዎችን፣ ቅንጅቶች፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ሚዲያ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ፡፡ ጡባዊ ተኮህን ምስጠራ አፈታት  አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት፡፡"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል፡፡ በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮህ እንደተሰካ ይሁን፡፡የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ፡፡"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"መለያዎችን፣ ቅንጅቶች፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ሚዲያ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ፡፡  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት፡፡"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል፡፡ በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ስልክህ እንደተሰካ ይሁን፡፡የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ፡፡"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ስልክ አመስጥር"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"እባክህ ባትሪህን ኃይል ሙላ እና እንደገና ሞክር።"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"እባክህ የኃይል መሙያዎን ሰካ እና እንደገና ሞክር።"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ምንም የማያቆልፍ PIN ወይም ይለፍቃል የለም"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"ማመስጠር ከመጀመርዎ በፊት የማያ ቆልፍ PIN ወይም ይለፍቃል ማዘጋጀት አለብዎ።"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ PIN ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"ምስጠራ አረጋግጥ"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"ጡባዊ ይመስጥር? ይህ ክንውን አይመለስም ካስተጓጎሉትም ውሂብዎ ይጠፋል።ማመስጠር አንድ ሰዓት ወይም ተጨማሪ ጊዜ ይወስዳል፣ በዚህ ጊዜ ጡባዊው ብዙ ጊዜድጋሚ ይነሳል።"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"ስልክ ይመስጥር? ይህ ክንውን አይመለስም ካስተጓጎሉትም ውሂብዎ ይጠፋል። ማመስጠር አንድ ሰዓት ወይም ተጨማሪ ጊዜ ይወስዳል፣ በዚህ ጊዜ ስልኩ ብዙ ጊዜድጋሚ ይነሳል።"</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"በ <xliff:g id="DELAY">^1</xliff:g>ሰከንዶች ውስጥ እንደገና ሞክር።"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"የይለፍቃልህን ተይብ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ምስጠራ ስኬታማ አልነበረም"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ጡባዊዎን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብዎ። ጡባዊዎን ዳግም ካስጀመሩ በኋላ ሲያዘጋጁ፣ ወደ Google መለያዎ አስጠብቀው የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ያገኛሉ።"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ስልክዎን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብዎ። ስልክዎን ዳግም ካስጀመሩ በኋላ ሲያዘጋጁ፣ ወደ Google መለያዎ አስጠብቀው የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ያገኛሉ።"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ጡባዊህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ጡባዊህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክህ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ስልክህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ስልክህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"የማያ ቆልፍ ምረጥ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"ምትኬ ቆላፊ ምረጥ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ ተቆልፏል"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ምንም"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"ተንሸራታች"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"ገጽ ክፈት"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"በስርዓተ ጥለት ተጠብቋል"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"በPIN  ተጠብቋል"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"በይለፍ ቃል ተጠብቋል"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"ሥርዓተ ጥለት"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ፒን"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"የይለፍ ቃል"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"የማያ መዝጊያ አጥፋ"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"የመክፈቻ ስርዓተ ጥለት አስወግድ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ PIN አስወግድ"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"የሙዚቃ ማሳመሪያዎች"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"የስልክ ጥሪ ድምፅ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ፀጥ ሲል ንዘር"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"ንዘር እና ጥራ"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"ንዘር"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"ነባሪ ማሳወቂያ"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"የማሳወቂያ ብርሃን አሳይ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"የስልክ ጥሪ ድምፅ"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"ስልክ አልተተከለም"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"ለአባሪ ትከል ቅንብሮች"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"ትከል አልተገኘም"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"ትክል ድምጽን ከማቀናበርህ በፊት ጡባዊህን መትከል አለብህ::"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"ተሰኪ ድምጽን ከማቀናበርህ በፊት ስልኩን መሰካት አለብህ::"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ተሰኪ ድምጽን ከማቀናበርህ በፊት ጡባዊ ተኮን መሰካት ያስፈልግሃል፡፡"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ተሰኪ ድምጽን ከማቀናበርህ በፊት ስልኩን መሰካት ያስፈልግሃል፡፡"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"ማስገቢያ ድምፅ ትከል"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"ጡባዊ ከትከል ስትከት ወይም ስታስወግድ ድምፅ አጫውት"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ስልክ ከትከል ሲከት ወይም ሲያስወግድ በድምፅ አጫውት"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"ሁሉም ያንተ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርማጃ መቀልበስ አትችልም!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ሁሉንም አጥፋ"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"የፋብሪካ ውሂብ ዳግም አስጀምር ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"የፋብሪካ ውሂብ ዳግም አስጀምር ለማረጋገጥ የእንተን መክፈቻ ስርዓተ ጥለት መሳል ያስፈልግሃል።"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"የስርዓቱ አገልግሎት አጥራ ስላልተገኘ ዳግም ለማስጀመር ምንም አልተከናወነም።"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ዳግም አቀናብር?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB ማከማቻ አጥፋ"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD ካርድ አጥፋ፣ እዚያ የተከማቹ ፋይሎች ሁሉ ይሰረዙ? እርምጃውን መመለስ አትችልም!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ሁሉንም አጥፋ"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"የ USB ካርዱን ማከማቻ ለማጥፋት መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"የ SD ካርዱን ለማጥፋት መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"የ USB ካርዱን ማከማቻ ለማጥፋት መፈለግህን ለማረጋገጥ የእንተን መክፈቻ ስርዓተ ጥለት መሳል አለብህ።"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"የ SD ካርዱን ለማጥፋት መፈለግህን ለማረጋገጥ የአንተን መክፈቻ ስርዓተ ጥለት መሳል አለብህ።"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"የጥሪ ቅንብሮች"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"የድምፅመልዕክት፣ የጥሪ ማስተላለፊያ፣መስመር ላይ ቆይ፣ የደዋይ ID አዋቅር"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB መሰካት"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"ቀጥል"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"ጡባዊዎን በማስጠበቅ ላይ"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"ስልክዎን በማስጠበቅ ላይ"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"የግል ማያ መክፈቻ ስርዓተ ጥለት በመፍጠር ጡባዊህን ካልተፈቀደ ጥቅም ትከላከላለህ። በሚቀጥለው ማያ ላይ በማንኛውም ስርዓተ ነጥቦቹን ለማገናኘት ጣትህን ትጠቀም። ቢያንስ አራት ነጥቦች ማገናኘት አለብህ።"\n\n" ለመጀመር ዝግጁ ነህ? \"ቀጥል\" ንካ።"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"የግል ማያ መክፈቻ ስርዓተ ጥለት በመፍጠር ጡባዊህን ካልተፈቀደ ጥቅም ትከላከላለህ። በሚቀጥለው ማያ ላይ በማንኛውም ስርዓተ ነጥቦቹን ለማገናኘት ጣትህን ተጠቀም። ቢያንስ አራት ነጥቦች ማገናኘት አለብህ።"\n\n" ለመጀመር ዝግጁ ነህ? \"ቀጥል\" ንካ።"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"የግል የስርዓተ ጥለት ማያ መክፈቻ በመፍጠር ስልክህን ካልተፈቀደ ጥቅም ጠብቅ። በሚቀጥለው ማያ ላይ በማንኛውም መልኩ ቢያንስ አራት ነጥቦች ጣትህን በመጠቀም አገናኝ። "\n\n" ለመጀመር ዝግጁ ነው? \"ቀጥሎ\" የሚለውን ንካ።"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"መተግበሪያዎች አስተዳድር"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"የተጫኑ መተግበራያዎች አስተዳድር እና አስወግድ"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"ስርዓት"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"ትልቅ ፅሁፍ"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"የኃይል ማስነሻ አዝራር ጥሪ"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"የይለፍ ቃሎችን ተናገር"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"በመንካት አስስ"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"በመንካት አስስ ሲበራ በጣትዎ ስር ያሉትን መግለጫዎች ይሰማሉ ወይም ያያሉ። "\n\n" ይህ ገፅታ አይናቸው ለደከመባቸው ነው።"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"ንካ&amp; አዘግይ ያዝ"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ምንም አገልግሎቶች አልተጫኑም"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"የማያ ማንበቢያ ያስፈልጋል?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack የንግግር ግብረ ምላሽን ለአይነስውራን እና ደካማ የአይን ብርሃን ላላቸው ተጠቃሚዎች ያቀርባል። ከAndroid ገበያ ላይ በነፃ ለመጫን ይፈልጋሉ?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"የድረ ስክሪፕቶች ይጫኑ?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"የድረ ይዘታቸውን የበለጠ ተደራሽ የሚያደርግ ከGoogle ላይ የትግበራ ስክሪፕቶች ለመጫን ይፈልጋሉ?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"ይህ ባህሪ መሳሪያህ ለንኪ የሚሰጠውን ምላሽ አሰጣጥ ይለውጣል፡፡ አብራው?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ምንም መግለጫ አልቀረበም።"</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"የመረጃው ማከማቻ ጠፍቷል"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"የማስረጃ ማከማቻ መጥፋት አልተቻለም።"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"የመረጃ ማከማቻ ነቅቷል።"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"የማስረጃ ማከማቻ ከመጠቀምህ በፊት የማያ ፒን ወይም ይለፍ ቃል ቆልፍ ማዘጋጀት አለብህ።"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"የማስረጃ ማከማቻ ከመጠቀምህ በፊት የማያ ፒን ወይም ይለፍ ቃል ቆልፍ ማዘጋጀት አለብህ።"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"የአደጋ ጊዜ ድምፅ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"የአደጋጊዜ ጥሪ ሲደረግ ባህሪ አዘጋጅ"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"መጠበቂያ &amp; ዳግም አስጀምር"</string>
@@ -1525,8 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec  ቀድሞ- የተጋራቁልፍ"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"የIPSec ተጠቃሚ ዕውቅና ማረጋገጫ"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"የIPSec CA ዕውቅና ማረጋገጫ"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"የላቁ አማራጮችን አሳይ"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"የDNS ፍለጋ ጎራዎች"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"የDNS አገልጋዮች (ምሳሌ 8.8.8.8)"</string>
@@ -1536,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"የመለያ መረጃ አስቀምጥ"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(አላገለገለም)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(አገልጋይ አታረጋግጥ)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"ይቅር"</string>
     <string name="vpn_save" msgid="4233484051644764510">"አስቀምጥ"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"አያይዝ"</string>
@@ -1561,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"ጨርስ"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"የአጋዥ ሥልጠናዝለል"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"ትምህርት1፡ ማያውን ማሰስ"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"በ \"ንኪ አስስ\" የሚለውን ካበራህ በኋላ፣ ከጣትህ ስር ምን እንዳለ ለማወቅ መታያ ገጹን መንካት ትችላለህ፡፡ ለምሳሌ፣ አሁን ያለው መታያ ገጽ መተግበሪያ አዶዎችን ይዞ ሊሆን ይችላል፡፡ መታያ ገጹን በመንካት አንደኛቸውን በመንካት እና እዛው አካባቢ ጣትህን በማንሸራተት አግኝ፡፡"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"በ ንኪ አስስ የሚለውን ካበራህ በኋላ፣ ከጣትህ ስር ምን እንዳለ ለማወቅ መታያ ገጹን መንካት ትችላለህ፡፡ ለምሳሌ፣ አሁን ያለው መታያ ገጽ መተግበሪያ አዶዎችን ይዞ ሊሆን ይችላል፡፡ መታያ ገጹን በመንካት አንደኛቸውን በመንካት እና እዛው አካባቢ ጣትህን በማንሸራተት አግኝ፡፡"</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"ጥሩ። ቢያንስ አንድ አዶ እስኪያገኙ ድረስ በማያው ላይ ጣትዎን ማንሸራተት ይቀጥሉ።"</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"እየነካህ ያለኸውን ለማንቃት፣ ሁለቴ ነካ አድርገው:: የ <xliff:g id="APP_NAME">%s</xliff:g> አዶን እስከምታገኝ ድረስ ጣትህን አንሸራት። ከዛም ለማንቃት አዶውን አንዴ ነካ አድርግ::"</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"ጣትዎየ<xliff:g id="APP_NAME">%s</xliff:g> አዶን እየነካ ነው። አዶውን ለማግበር አንዴ ነካ።"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 2546c39..d1450a8 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"بطاقة SD قابلة للإزالة"</item>
     <item msgid="4498124044785815005">"ترك القرار للنظام"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"إيقاف"</item>
-    <item msgid="4804571292609523335">"اهتزاز"</item>
-    <item msgid="595707141547423573">"كتم"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"دومًا"</item>
+    <item msgid="6293147072807231256">"مطلقًا"</item>
+    <item msgid="1276641209451816572">"فقط في الوضع صامت"</item>
+    <item msgid="8418930333779132418">"فقط في الوضع صامت"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d9f1d65..c343397 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"موافق"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"اسم المضيف الذي كتبته غير صالح."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"لم يتم تنسيق قائمة الاستبعاد التي كتبتها بشكل صحيح. اكتب قائمة مفصولة بفواصل للنطاقات المستبعدة."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"يجب عليك إكمال حقل المنفذ."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"يلزمك إكمال حقل المنفذ."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"يجب أن يكون حقل المنفذ فارغًا إذا كان حقل المضيف فارغًا."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"المنفذ الذي كتبته غير صالح."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"يستخدم المتصفح الخادم الوكيل HTTP، ولكنه ربما لا تستخدمه التطبيقات الأخرى."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"يلزم توفير رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفير الجهاز اللوحي في كل مرة يتم فيها تشغيله"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"يلزم توفير رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفير الهاتف في كل مرة يتم فيها تشغيله"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"مشفّر"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها ووسائطها وغير ذلك من الملفات. بعد تشفير جهازك اللوحي، يجب إدخال رقم تعريف شخصي رقمي أو كلمة مرور لفك تشفيره في كل مرة يتم فيها تشغيله: لا يمكنك فك تشفير جهازك اللوحي إلا عن طريق إجراء إعادة الضبط بحسب بيانات المصنع، مما ينتج عنه مسح جميع بياناتك."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء مستخدمًا بطارية مشحونة مع بقاء الجهاز اللوحي متصلاً بالشاحن حتى الانتهاء من عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض البيانات أو جميعها."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها ووسائطها وغير ذلك من الملفات. بعد تشفير هاتفك، يجب إدخال رقم تعريف شخصي رقمي أو كلمة مرور لفك تشفيره في كل مرة يتم فيها تشغيله: لا يمكنك فك تشفير هاتفك إلا من خلال إجراء إعادة الضبط بحسب بيانات المصنع، مما ينتج عنه محو جميع بياناتك."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء مستخدمًا بطارية مشحونة مع بقاء الهاتف متصلاً بالشاحن حتى الانتهاء من عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض البيانات أو جميعها."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الجهاز اللوحي، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير جهازك اللوحي إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل الجهاز اللوحي بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الهاتف، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير هاتفك إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل هاتفك بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"تشفير الجهاز اللوحي"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"تشفير الهاتف"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"اشحن البطارية وأعد المحاولة."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"صل الشاحن وأعد المحاولة."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ليس هناك رقم تعريف شخصي (PIN) أو كلمة مرور لتأمين الشاشة"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"يجب تعيين رقم تعريف شخصي (PIN) أو كلمة مرور لتأمين الشاشة قبل أن تتمكن من بدء عملية التشفير."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"يجب تعيين رقم تعريف شخصي أو كلمة مرور لتأمين الشاشة قبل أن تتمكن من بدء عملية التشفير."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"تأكيد التشفير"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"هل تريد تشفير الجهاز اللوحي؟ يتعذر التراجع عن هذه العملية، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الجهاز اللوحي عدة مرات."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"هل تريد تشفير الهاتف؟ يتعذر التراجع عن هذه العملية، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الهاتف عدة مرات."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"حاول مرة أخرى خلال <xliff:g id="DELAY">^1</xliff:g> ثانية."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"اكتب كلمة المرور"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"لم يتم التشفير بنجاح"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. "\n\n"لاستئناف استخدام الجهاز اللوحي، يجب إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. "\n\n"لاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. "\n\n"لاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. "\n\n"لاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"تحديد قفل الشاشة"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"اختر قفلاً للنسخ الاحتياطي"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"لا شيء"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"شريحة"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"تأمين الجهاز بالوجه"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"محمي باستخدام نقش"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"محمي برقم التعريف الشخصي"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"محمي باستخدام كلمة مرور"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"نقش"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"رقم التعريف الشخصي"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"كلمة المرور"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"إيقاف تأمين الشاشة"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"إزالة نقش إلغاء التأمين"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"إزالة رقم التعريف الشخصي لإلغاء التأمين"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"تأثيرات موسيقية"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"مستوى صوت الرنين"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"اهتزاز عند تشغيل الوضع صامت"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"الاهتزاز والرنين"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"اهتزاز"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"التنبيه الافتراضي"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"ضوء الإعلام بالنبض"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"نغمة الرنين"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"لم يتم إرساء الهاتف"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"إعدادات الإرساء المرفق"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"لم يتم العثور على الإرساء"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"يجب إرساء الجهاز اللوحي قبل إعداد إعدادات الإرساء الصوتية."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"يجب إرساء الهاتف قبل إعداد إعدادات الإرساء الصوتية."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"يلزمك إرساء الجهاز اللوحي قبل إعداد إعدادات الإرساء الصوتية."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"يلزمك إرساء الهاتف قبل إعداد إعدادات الإرساء الصوتية."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"صوت إدراج الإرساء"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"تشغيل صوت أثناء إدراج الجهاز اللوحي أو إزالته من المرسى"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"تشغيل الصوت عند إدراج أو إزالة الهاتف من الإرساء"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"هل تريد مسح جميع المعلومات الشخصية والتطبيقات التي تم تنزيلها؟ لا يمكنك عكس هذا الإجراء!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"مسح كل شيء"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ارسم نقش إلغاء التأمين"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"يجب رسم نقش إلغاء التأمين لتأكيد إعادة ضبط بيانات المصنع."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"يلزمك رسم نقش إلغاء التأمين لتأكيد إعادة الضبط بحسب بيانات المصنع."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"لم يتم تنفيذ إعادة التعيين نظرًا لعدم توفر خدمة System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"هل تريد إعادة الضبط؟"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"محو وحدة تخزين USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"هل تريد محو بطاقة SD، وحذف جميع الملفات المخزنة عليها؟ لا يمكن عكس هذا الإجراء!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"مسح كل شيء"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ارسم نقش إلغاء التأمين"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"يجب رسم نقش إلغاء التأمين لتأكيد أنك تريد محو وحدة تخزين USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"يجب رسم نقش إلغاء التأمين لتأكيد أنك تريد محو بطاقة SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة تخزين USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة بطاقة SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"إعدادات الاتصال"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"إعداد البريد الصوتي، إعادة توجيه الاتصال، انتظار المكالمة، معرف المتصل"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"ربط USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"التالي"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"تأمين الجهاز اللوحي"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"تأمين الهاتف"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يجب توصيل أربع نقاط على الأقل."\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يلزمك توصيل أربع نقاط على الأقل."\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"يمكنك حماية الهاتف من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط لتوصيل أربع نقاط على الأقل بأي ترتيب في الشاشة التالية. "\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"إدارة التطبيقات"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"إدارة التطبيقات المثبتة وإزالتها"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"النظام"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"نص كبير"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"زر التشغيل ينهي الاتصال"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"نطق كلمات المرور"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"الاستكشاف باللمس"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"عند تشغيل الاستكشاف باللمس، يمكنك سماع أوصاف لما يتم تحت إصبعك أو رؤيتها."\n\n" وقد تم تصميم هذه الميزة لضعاف البصر من المستخدمين."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"مهلة اللمس مع الاستمرار"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"لم يتم تثبيت أية خدمات"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"هل تحتاج إلى قارئ شاشة؟"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"يقدم TalkBack تعليقات منطوقة لمساعدة المستخدمين من المكفوفين وضعاف البصر. هل تريد تثبيته مجانًا من Android Market؟"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"هل تريد تثبيت النصوص البرمجية من الويب؟"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"هل تريد تثبيت نصوص برمجية من Google بواسطة التطبيقات لتسهيل الدخول إلى محتواها على الويب؟"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"تعمل هذه الميزة على تغيير الطريقة التي يستجيب بها الجهاز إلى اللمس. هل تريد تشغيلها؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"لم يتم تقديم أي وصف."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"تم مسح تخزين بيانات الاعتماد."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"تعذر محو وحدة تخزين بيانات الاعتماد."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"تم تمكين تخزين بيانات الاعتماد."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"يجب تعيين رقم تعريف شخصي لتأمين الشاشة أو كلمة مرور حتى تتمكن من استخدام وحدة تخزين بيانات الاعتماد."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"يلزمك تعيين رقم تعريف شخصي لتأمين الشاشة أو كلمة مرور حتى تتمكن من استخدام وحدة تخزين بيانات الاعتماد."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"نغمة الطوارئ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"تعيين السلوك عند إجراء اتصال بالطوارئ"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"نسخ احتياطي وإعادة تعيين"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"مفتاح IPSec مشترك مسبقًا"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"شهادة IPSec للمستخدم"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"شهادة CA لـ IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"شهادة خادم IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"إظهار الخيارات المتقدمة"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"نطاقات بحث نظام أسماء النطاقات"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"خوادم DNS (مثل 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"حفظ معلومات الحساب"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(غير مستخدم)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(عدم التحقق من ملكية الخادم)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(الواردة من الخادم)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"إلغاء"</string>
     <string name="vpn_save" msgid="4233484051644764510">"حفظ"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"اتصال"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"إنهاء"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"تخطي البرنامج التعليمي"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"الدرس الأول: استكشاف الشاشة"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"بعد تشغيل \"الاستكشاف من خلال اللمس\"، يمكنك لمس الشاشة للتعرف على ما يوجد تحت إصبعك. على سبيل المثال، تحتوي الشاشة الحالية على رموز تطبيقات. اعثر على أحدها من خلال لمس الشاشة وتمرير إصبعك حولها."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"بعد تشغيل \"الاستكشاف من خلال اللمس\"، يمكنك لمس الشاشة للتعرف على ما تحت إصبعك. على سبيل المثال، تحتوي الشاشة الحالية على رموز تطبيقات. يمكنك العثور على أحدها من خلال لمس الشاشة وتمرير إصبعك حولها."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"جيد، استمر في تمرير إصبعك عبر الشاشة حتى تعثر على رمز آخر على الأقل."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"لتنشيط عنصر تلمسه، انقر عليه. مرر إصبعك حتى تعثر على رمز <xliff:g id="APP_NAME">%s</xliff:g>. وانقر بعد ذلك على الرمز مرة واحدة لتنشيطه."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"أنت تلمس الرمز <xliff:g id="APP_NAME">%s</xliff:g> بإصبعك. انقر مرة واحدة لتنشيط الرمز."</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 8c5742a..c82e13a 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Зменная SD-карта"</item>
     <item msgid="4498124044785815005">"Няхай вырашыць сістэма"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Адключана"</item>
-    <item msgid="4804571292609523335">"Вібрацыя"</item>
-    <item msgid="595707141547423573">"Выключыць гук"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Заўсёды"</item>
+    <item msgid="6293147072807231256">"Ніколі"</item>
+    <item msgid="1276641209451816572">"Толькі ў рэжыме без гуку"</item>
+    <item msgid="8418930333779132418">"Толькі калі не ў рэжыме без гуку"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кароткі"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index eb5c55c..56b6819 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ОК"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Вы ўвялі несапраўднае імя вузла."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Спіс выключэнняў, які вы ўвялі, мае няправільны фармат. Увядзіце спіс выключаных даменаў праз коску."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Неабходна запоўніць поле порта."</string>
+    <!-- outdated translation 3525734169948795417 -->     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Неабходна запоўніць поле порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поле парта павінна быць пустым, калі поле хоста пустое."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Несапраўдны ўведзены порт."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі HTTP выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</string>
@@ -288,7 +288,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сартаваць па гадзінным поясе"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Час"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Паляпшэнне супастаўлення твараў"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Аўтаматычная блакіроўка"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> пасля сну"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Паказаць інфармацыю аб уладальніку на экране блакавання"</string>
@@ -306,14 +305,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Патрабаваць лічбавы PIN-код або пароль для расшыфроўкі планшэта пры кожным уключэнні"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Патрабаваць лічбавы PIN-код або пароль для расшыфроўкі тэлефона пры кожным уключэнні"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашыфраваны"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля шыфроўкі планшэта неабходна ўвесці лічбавы PIN-код або пароль, каб расшыфроўваць планшэт пры кожным уключэнні. Вы можаце расшыфраваць планшэт, толькі выканаўшы скід налад дадзеных, выдаляючы ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну або больш. Пачынаць шыфраванне трэба з зараджанай батарэяй і не адключаць планшэт да завяршэння шыфравання. Калі працэс шыфравання перапынецца, вы страціце ўсё або некаторыя з вашых дадзеных."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля шыфроўкі тэлефона неабходна ўвесці лічбавы PIN-код або пароль, каб расшыфроўваць тэлефон пры кожным уключэнні. Вы можаце расшыфраваць тэлефон, толькі выканаўшы скід налад дадзеных, выдаляючы ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну або больш. Пачынаць шыфраванне трэба з зараджаным акумулятярам і не адключаць тэлефон да завяршэння шыфравання. Калі працэс шыфравання перапынiцца, вы страціце ўсе або некаторыя дадзеныя."</string>
+    <!-- outdated translation 923629233459331136 -->     <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля шыфроўкі планшэта неабходна ўвесці лічбавы PIN-код або пароль, каб расшыфроўваць планшэт пры кожным уключэнні. Вы можаце расшыфраваць планшэт, толькі выканаўшы скід налад дадзеных, выдаляючы ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну або больш. Пачынаць шыфраванне трэба з зараджанай батарэяй і не адключаць планшэт да завяршэння шыфравання. Калі працэс шыфравання перапынецца, вы страціце ўсё або некаторыя з вашых дадзеных."</string>
+    <!-- outdated translation 923629233459331136 -->     <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля шыфроўкі планшэта неабходна ўвесці лічбавы PIN-код або пароль, каб расшыфроўваць планшэт пры кожным уключэнні. Вы можаце расшыфраваць планшэт, толькі выканаўшы скід налад дадзеных, выдаляючы ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну або больш. Пачынаць шыфраванне трэба з зараджанай батарэяй і не адключаць планшэт да завяршэння шыфравання. Калі працэс шыфравання перапынецца, вы страціце ўсё або некаторыя з вашых дадзеных."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шыфраваць планшэт"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шыфраванне тэлефона"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Неабходна зарадзіць акумулятар і паўтарыць спробу."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Падключыце зарадную прыладу і паспрабуйце яшчэ раз."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Няма PIN-код або паролю блакавання экрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Вы павінны наладзіць PIN-код або пароль блакавання экрана, перш чым пачаць шыфраванне."</string>
+    <!-- outdated translation 17076329416977176 -->     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Вы павінны наладзіць PIN-код або пароль блакавання экрана, перш чым пачаць шыфраванне."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Пацвердзіць шыфраванне"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Шыфраванне планшэта? Гэтая аперацыя з\'яўляецца незваротнай, у выпадку яе перарывання, вы страціце дадзеныя. Шыфраванне займае гадзіну ці больш, за гэты час планшэт будзе перазапушчаны некалькі разоў."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Шыфраванне тэлефона? Гэтая аперацыя з\'яўляецца незваротнай, у выпадку яе перарывання, вы страціце дадзеныя. Шыфраванне займае гадзіну ці больш, за гэты час тэлефон будзе перазапушчаны некалькі разоў."</string>
@@ -323,20 +322,20 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Паўтарыце спробу праз <xliff:g id="DELAY">^1</xliff:g> с."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Увядзіце пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шыфраванне няўдалае"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Шыфраванне было перапынена і не можа завяршыцца. У выніку дадзеныя на вашым планшэце больш не даступныя."\n\n"Каб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Шыфраванне было перапынена і не можа завяршыцца. У выніку дадзеныя на вашым тэлефоне больш недаступныя."\n\n"Каб выкарыстоўваць тэлефон далей, неабходна выканаць скід налад. Пры наладзе тэлефона пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
+    <!-- outdated translation 6891198717505120682 -->     <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шыфраванне было перапынена і не можа завяршыцца. У выніку дадзеныя на вашым планшэце больш не даступныя."\n\n"Каб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
+    <!-- outdated translation 6891198717505120682 -->     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шыфраванне было перапынена і не можа завяршыцца. У выніку дадзеныя на вашым планшэце больш не даступныя."\n\n"Каб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Выберыце блакаванне экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Блакав. рэз. капіяв."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блакоўка экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змена блакавання экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Змяніць або адключыць шаблон, PIN-код або пароль бяспекі"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Выберыце метад блакавання экрана"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Хочаце разблакаваць, нават калi \"Фэйскантроль\" вас не бачыць?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Хочаце разблакаваць, нават калi Face Unlock вас не бачыць?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Няма"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Правесці"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Функцыі бяспекі адключаныя"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Фэйскантроль"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Распазнаванне твару"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Нізкі ўзровень бяспекі, эксперымент. налада"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Шаблон"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Сярэдні ўзровень бяспекі"</string>
@@ -347,10 +346,10 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Выключана адміністратарам, палітыкай шыфравання ці сховішчам уліковых дадзеных"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Правесці"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Фэйскантроль"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Абарона з дапамогай узора"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Абароненыя з дапамогай PIN-коду"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Абарона з дапамогай пароля"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Распазнаванне твару"</string>
+    <!-- outdated translation 464022606293547390 -->     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Абарона з дапамогай узора"</string>
+    <!-- outdated translation 1379365142708807163 -->     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Абароненыя з дапамогай PIN-коду"</string>
+    <!-- outdated translation 6955742995327081060 -->     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Абарона з дапамогай пароля"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Выключыць блакаванне экрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Выдаліць графiчны ключ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Выдаліць PIN-код разблакавання"</string>
@@ -594,7 +593,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Музычныя эфекты"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Гучнасць званка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібрацыя ў бязгучным рэжыме"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Вібрацыя і выклік"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Вібрацыя"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Паведамленні па змаўчанні"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Імпульснае святло апавяшчэння"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Рынгтон"</string>
@@ -623,8 +622,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Тэлефон не пастаўлены ў док-станцыю"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Налады падлучанай док-станцыі"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Док-станцыя не знойдзеная"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Перад усталяваннем док-станцыi вы павінны падключыць планшэт."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Перад усталяваннем док-станцыi вы павінны падключыць тэлефон."</string>
+    <!-- outdated translation 9015625921245904495 -->     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Перад усталяваннем док-станцыi вы павінны падключыць планшэт."</string>
+    <!-- outdated translation 9015625921245904495 -->     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Перад усталяваннем док-станцыi вы павінны падключыць планшэт."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Гук пры ўсталяваннi ў док-станцыю"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Прайграваць гук пры ўсталёўцы і выманні планшэта з гнязда"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Прайграваць гук пры ўсталёўцы ці выманні тэлефона з док-станцыі"</string>
@@ -645,15 +644,13 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Пасля бяздзейнасці: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Шпалеры"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Выбраць шпалеры ў"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Застаўка экрана"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Запусціцца у спячым рэжыме, калі будзе падлучаны да электрасілкавання"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Адключана"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Абраны модуль"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Хуткасць актывацыі"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Час прастою: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ніколі"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Паспрабуйце!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Таксама запускаць ў прыстыкаваным стане"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Экранныя застаўкі і іншыя віды прастою"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Выбраны модуль"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Хуткасць актывацыі"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Час прастою: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Ніколі"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Паспрабуйце!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Памер шрыфта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Памер шрыфту"</string>
@@ -823,7 +820,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Выдалiць ўсю вашу асабістую інфармацыю і спампаваныя прыкладанні? Дзеянне нельза адмянiць."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Выдаліць усе"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Выканайце мадэль разблакоўкі"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Вы павінны паўтарыць вашую мадэль разблакоўкі, каб пацвердзіць скід налад дадзеных."</string>
+    <!-- outdated translation 2234954758550554549 -->     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Вы павінны паўтарыць вашую мадэль разблакоўкі, каб пацвердзіць скід налад дадзеных."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Скід не выкананы, таму што не прадастаўляецца паслуга ачысткі сістэмы."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Скінуць?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ачысціць USB-назапашвальнiк"</string>
@@ -838,8 +835,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ачысціць SD-карту і выдаліць ўсе файлы, якія захоўваюцца там? Гэта дзеянне нельга будзе адмяніць."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Выдаліць усё"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Выканайце вашую камбінацыю разблакоўкі"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Вы павінны паўтарыць вашую мадэль разблакоўкі, каб пацвердзіць, што жадаеце выдаліць дадзеныя з USB-назапашвальнiка."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Вы павінны паўтарыць вашую мадэль разблакоўкі, каб пацвердзіць, што жадаеце ачысцiць SD-карту."</string>
+    <!-- outdated translation 1379736318750958338 -->     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Вы павінны паўтарыць вашую мадэль разблакоўкі, каб пацвердзіць, што жадаеце выдаліць дадзеныя з USB-назапашвальнiка."</string>
+    <!-- outdated translation 1379736318750958338 -->     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Вы павінны паўтарыць вашую мадэль разблакоўкі, каб пацвердзіць, што жадаеце выдаліць дадзеныя з USB-назапашвальнiка."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Налады выклікаў"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Выбраць галасавую пошту, перанакіраванне выклікаў, чаканне выклікаў, аўтаматычны вызначальнiк нумару"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-мадэм"</string>
@@ -887,6 +884,9 @@
     <string name="copyright_title" msgid="865906688917260647">"Аўтарскія правы"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцэнзія"</string>
     <string name="terms_title" msgid="7697580845616764642">"Правілы і ўмовы"</string>
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Дапаможнік па сістэме"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Даведайцеся, як працаваць з планшэтам"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Даведайцеся, як выкарыстоўваць ваш тэлефон"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Ліцэнзіі на ПЗ з адкрытым зыходным кодам"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Немагчыма загрузіць ліцэнзіі."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Загрузка..."</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Далей"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Абарона планшэта"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Абарона тэлефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Абараніце свой планшэт ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. Пальцам злучыце кропкі на наступным экране ў любым парадку. Вы павінны злучыць як мінімум чатыры кропкі."\n\n"Гатовы? Нацiснiце \"Далей\"."</string>
+    <!-- outdated translation 1075370160667458122 -->     <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Абараніце свой планшэт ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. Пальцам злучыце кропкі на наступным экране ў любым парадку. Вы павінны злучыць як мінімум чатыры кропкі."\n\n"Гатовы? Нацiснiце \"Далей\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Абараніце свой тэлефон ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. На наступным экране злучыце ў любым парадку не менш за чатыры кропкi. "\n" "\n" Гатовы пачаць? Націсніце \"Далей\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Кіраванне прыкладаннямі"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Кіраванне ўсталяванымi прыкладаннямi і iх выдаленне"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Сістэма"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Вялікі шрыфт"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Нац. на кнопку сілкавання зав. выклік"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Прамовіць паролі"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Прагледзець праз дакрананне"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Калі ўключана функцыя Explore by Touch, вы можаце пачуць або ўбачыць апісанне таго, што пад вашым пальцам."\n\n"Гэтая функцыя прызначаная для карыстальнікаў з дрэнным зрокам."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Дакраніцеся і затрымайце"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма ўсталяваных службаў"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Патрэбная праграма для чытання з экрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Прыкладанне TalkBack забяспечвае вусную зваротную сувязь, каб дапамагаць сляпым карыстальнікам і карыстальнікам з дрэнным зрокам. Усталяваць яго бясплатна з Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Усталяваць вэб-скрыпты?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Жадаеце, каб прыкладанні ўсталявалі скрыпты ад Google, якія зробяць іх змесціва ў Iнтэрнэце больш даступным?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Гэтая функцыя змяняе спосаб, якім прылада рэагуе на дакрананні. Уключыць?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма апісання."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Захаваныя ўліковыя дадзеныя сціраюцца."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Нельга ачысціць сховішча ўліковых дадзеных."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Сховішча ўлік. дадз. уключанае."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Перш чым вы можаце выкарыстоўваць сховішча ўліковых дадзеных, усталюйце PIN-код для блакавання экрана або пароль."</string>
+    <!-- outdated translation 6048426197489058494 -->     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Перш чым вы можаце выкарыстоўваць сховішча ўліковых дадзеных, усталюйце PIN-код для блакавання экрана або пароль."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Надзвычайны гук"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаць паводзіны на выпадак экстранага выкліку"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Рэзервовае капіраванне і скідванне"</string>
@@ -1429,9 +1427,6 @@
     <string name="sync_item_title" msgid="1931551540462877488">"Сінхранізаваць <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Немагчыма сінхранізаваць уручную"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Сінхранізацыя для гэтага элемента зараз адключаная. Каб змяніць налады, часова дазвольце абмен дадзенымі ў фонавым рэжыме і аўтаматычную сінхранізацыю."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Налады 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Наладзіць і кіраваць сеткай 4G і мадэмам"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адрас"</string>
     <string name="enter_password" msgid="4131758584074246224">"Увядзіце пароль для расшыфроўкі сховiшча"</string>
     <string name="try_again" msgid="4272075051293936921">"Паспрабуйце яшчэ."</string>
     <string name="service_busy" msgid="2325014135156127705">"Служба занята. Паспрабуйце яшчэ раз."</string>
@@ -1525,8 +1520,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Папярэдне размеркаваны ключ IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Сертыфікат карыстальніка IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"CA-сертыфікат IPSec"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"Паказаць спецыяльныя параметры"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Дамены DNS-пошуку"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-серверы (напрыклад, 8.8.8.8)"</string>
@@ -1536,8 +1529,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Захаваць інфармацыю аб уліковым запісе"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(Не выкарыстоўваецца)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(не правяраць сервер)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"Адмяніць"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Захаваць"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Злучыцца"</string>
@@ -1561,7 +1552,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Гатова"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Прапусціць навучанне"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1. Вывучэнне экрана"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Пасля ўключэння функцыі \"Даследаваць, дакрануўшыся\" вы можаце дакрануцца да экрана, каб даведацца, што знаходзiцца пад вашым пальцам. Напрыклад, бягучы экран змяшчае значкі прыкладанняў. Знайдзіце адно з іх, дакрануўшыся да экрана і перасунуўшы палец навокал."</string>
+    <!-- outdated translation 477937585801538951 -->     <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Пасля ўключэння функцыі \"Даследаваць, дакрануўшыся\" вы можаце дакрануцца да экрана, каб даведацца, што знаходзiцца пад вашым пальцам. Напрыклад, бягучы экран змяшчае значкі прыкладанняў. Знайдзіце адно з іх, дакрануўшыся да экрана і перасунуўшы палец навокал."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добра. Трымайце палец па экране, пакуль не знойдзеце хаця б яшчэ адзін значок."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Каб актываваць тое, да чаго вы дакранаецеся, дакраніцеся да яго. Правядзіце пальцам, пакуль не знойдзеце значок для прыкладання <xliff:g id="APP_NAME">%s</xliff:g>. Потым націсніце на значок адзін раз, каб актываваць яго."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Вы дакранаецеся пальцам да значку <xliff:g id="APP_NAME">%s</xliff:g>. Націсніце адзін раз, каб актываваць значок."</string>
@@ -1580,5 +1571,4 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Пазначце пароль рэзервовага капіравання"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Адмена"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дадатк. абнаўл. сістэмы"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 8a66cbc..7e0acce 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"SD карта, която може да се премахва"</item>
     <item msgid="4498124044785815005">"Нека системата да реши"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Изключено"</item>
-    <item msgid="4804571292609523335">"Вибриране"</item>
-    <item msgid="595707141547423573">"Без звук"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Винаги"</item>
+    <item msgid="6293147072807231256">"Никога"</item>
+    <item msgid="1276641209451816572">"Само в тих режим"</item>
+    <item msgid="8418930333779132418">"Само извън тих режим"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a657715..9693bad 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Въведеното от вас име на хост е невалидно."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Въведеният от вас списък за изключване не е правилно форматиран. Въведете списък с изключените домейни, разделени със запетаи."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Трябва да попълните полето за порт."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Трябва да попълните полето за порт."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Полето за порт трябва да е празно, ако полето за хост е."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Въведеният от вас порт е невалиден."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP прокси сървърът се използва от браузъра, но не и от други приложения."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Изисква се цифров PIN код или парола за разшифроване на таблета ви при всяко включване"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Изисква се цифров PIN код или парола за разшифроване на телефона ви при всяко включване"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за таблета си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да обърнете процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и таблетът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да обърнете процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за таблета си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и таблетът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифроване на таблета"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифроване на телефона"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Заредете батерията си и опитайте отново."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Включете зарядното си устройство и опитайте отново."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Няма PIN код или парола за заключване на екрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Трябва да зададете PIN код или парола за заключване на екрана, преди да можете да започнете шифроването."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Трябва да зададете ПИН код или парола за заключване на екрана, преди да можете да започнете шифроването."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Потвърждаване на шифроването"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Да се шифрова ли таблетът? Тази операция е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време таблетът ще се рестартира няколко пъти."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Да се шифрова ли телефонът? Тази операция е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време телефонът ще се рестартира няколко пъти."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Опитайте отново след <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Въведете паролата си"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифроването не бе успешно"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Заключване на екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Резервно заключване"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заключване на екрана"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Плъзгане"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Отключване с лице"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Защитено с фигура"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Защитено с PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Защитено с парола"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Фигура"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ПИН"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Парола"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Изключване на заключването на екрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Премахване на фигура за отключване"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Премахване на PIN кода за отключване"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Музикални ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Сила на звука при звънене"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрира при тих режим"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Да вибрира и звъни"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Вибриране"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Известие по подразбиране"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсиране на светлината за известия"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Телефонът не е свързан с докинг станция"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Настройки за прикрепената докинг станция"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Няма намерена докинг станция"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Трябва да свържете таблета си с докинг станция, преди да настроите аудиото за нея."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Трябва да свържете телефона си с докинг станция, преди да настроите аудиото за нея."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Трябва да свържете таблета си с докинг станция, преди да настроите звука за нея."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Трябва да свържете телефона си с докинг станция, преди да настроите звука за нея."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Със звук при поставяне на докинг станция"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"С пускане на звук при поставяне или премахване на таблета от докинг станция"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"С пускане на звуци при поставяне или премахване на телефона от докинг станция"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Да се изтрие ли цялата ви лична информация и всички изтеглени приложения? Не можете да отмените това действие!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Изтриване на всичко"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертайте фигурата си за отключване"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Трябва да начертаете фигурата си за отключване, за да потвърдите възстановяването на фабричните настройки."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Трябва да начертаете фигурата си за отключване, за да потвърдите възстановяването на фабричните настройки."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Не се състоя рестартиране, защото услугата за изчистване на системата не се предлага."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Да се зададе ли повторно?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Изтриване на USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Да се изтрие ли SD картата заедно с всички съхранявани там файлове? Не можете да отмените това действие!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Изтриване на всичко"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Начертайте фигурата си за отключване"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете USB хранилището."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете SD картата."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете USB хранилището."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете SD картата."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Настройки за обаждане"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Настройка на гласова поща, пренасочване, изчакване и идентификация на обаждането"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Тетъринг през USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Напред"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Подсигуряване на таблета ви"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Защитаване на телефона ви"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Защитете телефона си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред поне 4 точки на следващия екран. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление на приложенията"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление и премахване на инсталирани приложения"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Голям текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Край на обажд.: Бутон за захранване"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Изговаряне на паролите"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Изследване чрез докосване"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Когато изследването чрез докосване е включено, можете да чуете или видите описания на това, какво има под пръста ви."\n\n" Тази функция е за потребители с намалено зрение."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Докосване и дълго задържане"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма инсталирани услуги"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Трябва ли ви екранен четец?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack осигурява устна обратна връзка, за да помогне на потребители с увредено и намалено зрение. Искате ли да го инсталирате безплатно от Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Да се инсталират ли уеб скриптовете?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Искате ли приложенията да инсталират скриптове от Google, които правят съдържанието им в мрежата по-достъпно?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Тази функция променя начина, по който устройството ви реагира при допир. Да се включи ли?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма описание."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Хранилище с данни: изтрито."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Хран. за идент. данни не можа да бъде изтрито."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилището за идентификационни данни е активирано."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Трябва да зададете ПИН код или парола за заключен екран, преди да можете да използвате хранилището за идентификационни данни."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Трябва да зададете ПИН код или парола за заключен екран, преди да можете да използвате хранилището за идентификационни данни."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за спешност"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаване на поведение при спешно обаждане"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Резервни копия и нулиране"</string>
@@ -1525,8 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Предварително споделен ключ за IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Потребителски сертификат за IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Сертификат от сертиф. орган за IPSec"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"Показване на разширените опции"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS домейни за търсене"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS домейни (напр. 8.8.8.8)"</string>
@@ -1536,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Запазване на информацията за профила"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(неизползвано)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(без потвърждаване на сървъра)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"Отказ"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Запазване"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Свързване"</string>
@@ -1561,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Край"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Пропускане"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1: Изследване на екрана"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"След като включите изследването чрез докосване, можете да докосвате екрана, за да разберете какво има под пръста ви. Например текущият екран съдържа икони на приложения. Намерете една от тях, като докоснете екрана и плъзнете пръста си наоколо."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Когато изследването чрез докосване е включено, можете да докосвате екрана, за да разберете какво има под пръста ви. Например текущият екран съдържа икони на приложения. Намерете една от тях, като докоснете екрана и плъзнете пръста си наоколо."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добре! Продължете да плъзгате пръста си по екрана, докато намерите поне още една икона."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"За да активирате нещо, което докосвате, го натиснете. Плъзнете пръста си, докато намерите иконата на <xliff:g id="APP_NAME">%s</xliff:g>. После я натиснете веднъж, за да я активирате."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Пръстът ви докосва иконата на <xliff:g id="APP_NAME">%s</xliff:g>. Докоснете веднъж, за да я активирате."</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index e091d16..99fda85 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Targeta SD extraïble"</item>
     <item msgid="4498124044785815005">"Deixa que ho decideixi el sistema"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desactivat"</item>
-    <item msgid="4804571292609523335">"Vibra"</item>
-    <item msgid="595707141547423573">"Silencia"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Sempre"</item>
+    <item msgid="6293147072807231256">"Mai"</item>
+    <item msgid="1276641209451816572">"Només en mode silenciós"</item>
+    <item msgid="8418930333779132418">"Només quan no és en mode silenciós"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index aaff5a9..7320f24 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"D\'acord"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"El nom d\'amfitrió que has escrit no és vàlid."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"La llista d\'exclusió que has escrit no té un format adequat. Introdueix una llista separada per comes de dominis exclosos."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Heu de completar el camp del port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Has de completar el camp del port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El camp del port ha de ser buit si el camp de l\'amfitrió és buit."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El port que has escrit no és vàlid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utilitza un servidor intermediari HTTP, però pot ser que la resta d\'aplicacions no."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Demana un PIN numèric o una contrasenya per desencriptar la tauleta cada vegada que l\'engeguis"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Demana un PIN numèric o una contrasenya per desencriptar el telèfon cada vegada que l\'engeguis"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Pots encriptar els teus comptes, la teva configuració, les aplicacions que hagis baixat, les seves dades, els seus fitxers multimèdia i qualsevol altre fitxer. Quan encriptis la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis: no pots desencriptar-la a menys que duguis a terme un restabliment de les dades de fàbrica, la qual cosa esborraria totes les teves dades."\n\n"L\'encriptació necessita una hora com a mínim. Has de començar amb la bateria carregada i mantenir la tauleta endollada fins que l\'encriptació finalitzi. Si interromps el procés d\'encriptació, perdràs dades, ja sigui una part o la totalitat."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Pots encriptar els teus comptes, la teva configuració, les aplicacions que hagis baixat, les seves dades, els seus fitxers multimèdia i qualsevol altre fitxer. Quan encriptis el teu telèfon, has d\'introduir un PIN numèric o una contrasenya per desencriptar-lo cada vegada que l\'engeguis: no pots desencriptar-lo a menys que duguis a terme un restabliment de les dades de fàbrica, la qual cosa esborraria totes les teves dades."\n\n"L\'encriptació necessita una hora com a mínim. Has de començar amb la bateria carregada, i mantenir el telèfon endollat fins que l\'encriptació finalitzi. Si interromps el procés d\'encriptació, perdràs dades, ja sigui una part o la totalitat."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Pots encriptar els teus comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Quan encriptis la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis: no pots desencriptar-la tret que duguis a terme un restabliment de les dades de fàbrica, la qual cosa esborraria totes les teves dades."\n\n"L\'encriptació triga una hora o més. Cal que iniciïs el procés amb la bateria carregada i que mantinguis la tauleta connectada fins que no s\'hagi completat l\'encriptació. Si interromps el procés d\'encriptació, perdràs totes les dades o bé una part."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Pots encriptar els teus comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptis el telèfon, necessitaràs un PIN numèric o contrasenya per desencriptar-lo cada vegada que l\'encenguis: no podràs desencriptar el telèfon tret que duguis a terme un restabliment de les dades de fàbrica, cosa que n\'esborrarà totes les dades."\n\n"L\'encriptació triga una hora o més. Cal que iniciïs el procés amb la bateria carregada i que mantinguis el telèfon connectat fins que no s\'hagi completat l\'encriptació. Si interromps el procés d\'encriptació, perdràs totes les dades o bé una part."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encripta la tauleta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encripta el telèfon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carrega la bateria i torna-ho a provar."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Endolla el carregador i torna-ho a provar."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No hi ha cap PIN ni cap contrasenya de bloqueig de la pantalla"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Has de definir un PIN o una contrasenya de bloqueig de la pàgina per començar l\'encriptació."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Has de definir un PIN o una contrasenya de bloqueig de la pàgina per començar l\'encriptació."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmació de l\'encriptació"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vols encriptar la tauleta? Aquesta operació és irreversible i, si l\'interromps, perdràs les dades. L\'encriptació necessita una hora com a mínim, durant la qual la tauleta es reiniciarà diverses vegades."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vols encriptar el telèfon? Aquesta operació és irreversible i, si l\'interromps, perdràs les dades. L\'encriptació necessita una hora com a mínim, durant la qual el telèfon es reiniciarà diverses vegades."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Torna-ho a provar d\'aquí a <xliff:g id="DELAY">^1</xliff:g> segons."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escriu la contrasenya"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"S\'ha produït un error en encriptar"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades de la tauleta. "\n\n"Per reprendre l\'ús de la tauleta, cal que duguis a terme un restabliment de fàbrica. Quan configuris la tauleta després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu Compte de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades del telèfon. "\n\n"Per reprendre l\'ús del telèfon, cal que duguis a terme un restabliment de fàbrica. Quan configuris el telèfon després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu Compte de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades de la tauleta. "\n\n"Per reprendre l\'ús de la tauleta, cal que duguis a terme un restabliment de fàbrica. Quan configuris la tauleta després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades del telèfon. "\n\n"Per reprendre l\'ús del telèfon, cal que duguis a terme un restabliment de fàbrica. Quan configuris el telèfon després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Selecc. bloq. pantalla"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Tria bloq. còpia seg."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueig de pantalla"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Cap"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Diapositiva"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueig facial"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Assegurada mitjançant patró"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Assegurada mitjançant PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegida amb contrasenya"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patró"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contrasenya"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactiva el bloqueig de pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Elimina el patró de desbloqueig"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Elimina el PIN de desbloqueig"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efectes musicals"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibra i sona"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibra"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Notificació predeterminada"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Llum de notificació d\'impulsos"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"To"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telèfon no acoblat a la base"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuració de la base connectada"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No s\'ha trobat la base"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Has de connectar la tauleta abans de configurar l\'àudio de connexió."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Has de connectar el telèfon abans de configurar l\'àudio de connexió."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Has de connectar la tauleta abans de configurar l\'àudio de connexió."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Has de connectar el telèfon abans de configurar l\'àudio de connexió."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"So d\'inserció del connector"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reprodueix so en inserir o retirar la tauleta de la base"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reprodueix un so en inserir o treure el telèfon de la base"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vols esborrar tota la informació personal i les aplicacions baixades? Aquesta acció no es pot desfer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Esborra-ho tot"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuixeu el perfil de desbloqueig"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Has de dibuixar el teu patró de desbloqueig per confirmar un restabliment de dades de fàbrica."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Has de dibuixar el teu patró de desbloqueig per confirmar el restabliment de dades de fàbrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vols restablir?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Esborra l\'emmagatzematge USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vols esborrar la targeta SD i suprimir tots els fitxers que hi ha emmagatzemats? Aquesta acció no es pot desfer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Esborra-ho tot"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dibuixeu el perfil de desbloqueig"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar l\'emmagatzematge USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar la targeta SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar l\'emmagatzematge USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar la targeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Configuració de trucada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Connexió compart. per USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Següent"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Seguretat de la tauleta"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Protecció del telèfon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Protegeix la tauleta de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar el dit per connectar els punts en l\'ordre que vulguis a la pantalla següent. Has de connectar un mínim de quatre punts. "\n\n"Estàs preparat per començar? Toca Següent."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protegeix la tauleta de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar el dit per connectar els punts en l\'ordre que vulguis a la pantalla següent. Has de connectar un mínim de quatre punts. "\n\n"Estàs preparat per començar? Toca Següent."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protegeix el telèfon de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar el dit per connectar quatre punts com a mínim en l\'ordre que vulguis a la pantalla següent. "\n\n"Estàs preparat per començar? Toca Següent."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestiona i elimina les aplicacions instal·lades"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Text gran"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"El botó d\'engegada finalitza la trucada"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Pronuncia contrasenyes"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explora amb el tacte"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quan Explore by Touch està activat, pots escoltar o veure les descripcions del que hi ha sota el dit."\n\n" Aquesta funció és per a usuaris amb visió reduïda."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retard de Toca i mantén premut"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No hi ha cap servei instal·lat"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Necessites un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack proporciona comentaris per veu per ajudar usuaris invidents i amb visió disminuïda. Vols instal·lar-lo de manera gratuïta des d\'Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vols instal·lar scripts web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vols que les aplicacions instal·lin scripts de Google que faran que el seu contingut sigui més accessible?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Aquesta funció canvia la manera com el teu dispositiu respon a l\'exploració tàctil. Vols activar-la?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No s\'ha proporcionat cap descripció."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Emmag. credencials esborrat."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"L\'emmagatzematge de credencials no s\'ha esborrat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'emmagatzematge de credencials està activat."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Has d\'establir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Has d\'establir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"To d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Còpia de seguretat i restabliment"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Clau prèviament compartida d\'IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificat d\'usuari IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificat de CA IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certificat de servidor IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Mostra les opcions avançades"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Dominis de cerca DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidors DNS (per exemple, 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Desa la informació del compte"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(sense utilitzar)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(no comprovis el servidor)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(rebut del servidor)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Cancel·la"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Desa"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Connecta"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalitza"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Omet"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lliçó 1: Exploració de la pantalla"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Quan hagis activat la funció d\'exploració tàctil, podràs tocar la pantalla per saber què tens sota el dit. Per exemple, la pantalla actual conté icones d\'aplicacions. Si vols cercar-ne una, toca la pantalla i fes lliscar el dit pertot arreu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Quan l\'opció Explora amb el tacte està activada, pots tocar la pantalla per saber què hi ha sota el teu dit. Per exemple, la pantalla actual conté icones d\'aplicacions. Per trobar-ne una, toca la pantalla i fes lliscar el dit."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bé, mantén el dit a la pantalla i continua fent-lo lliscar per trobar com a mínim una altra icona."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Per activar una cosa que estàs tocant, fes lliscar el dit fins a trobar la icona de <xliff:g id="APP_NAME">%s</xliff:g>. A continuació, prem la icona una vegada per activar-la."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Tens el dit sobre la icona de <xliff:g id="APP_NAME">%s</xliff:g>. Pica-la una vegada per activar-la."</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index fb36a40..d345cc4 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Vyjímatelná karta SD"</item>
     <item msgid="4498124044785815005">"Automaticky vybere systém"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Vypnuto"</item>
-    <item msgid="4804571292609523335">"Vibrovat"</item>
-    <item msgid="595707141547423573">"Ztlumit"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Vždy"</item>
+    <item msgid="6293147072807231256">"Nikdy"</item>
+    <item msgid="1276641209451816572">"Pouze v tichém režimu"</item>
+    <item msgid="8418930333779132418">"Pouze pokud není v tichém režimu"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátké"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0276dfc..55b1d55 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Zadaný název hostitele není platný."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Seznam vyloučení, který jste vytvořili, má nesprávný formát. Zadejte seznam názvů domén k vyloučení a jednotlivé názvy oddělte čárkami."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Je třeba vyplnit pole port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Je třeba vyplnit pole portu."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pokud je pole hostitel prázdné, musí být prázdné i pole port."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Zadaný port není platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Server proxy protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Při každém zapnutí tabletu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Při každém zapnutí telefonu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrováno"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete šifrovat. Jakmile tablet zašifrujete, musíte jej při každém zapnutí dešifrovat pomocí kódu PIN nebo hesla. Šifrování můžete zrušit pouze obnovením továrního nastavení, čímž se veškerá data v tabletu vymažou."\n\n" Šifrování může trvat více než hodinu. V tabletu musí být nabitá baterie a po celou dobu šifrování musí být zapojen ke zdroji napájení. Pokud proces šifrování přerušíte, ztratíte některá nebo všechna data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete šifrovat. Jakmile telefon zašifrujete, musíte jej při každém zapnutí dešifrovat pomocí kódu PIN nebo hesla. Šifrování můžete zrušit pouze obnovením továrního nastavení, čímž se veškerá data v telefonu vymažou."\n\n" Šifrování může trvat více než hodinu. V telefonu musí být nabitá baterie a po celou dobu šifrování musí být telefon připojen ke zdroji elektřiny. Pokud proces šifrování přerušíte, ztratíte některá nebo všechna data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Můžete zašifrovat své účty, nastavení, stažené aplikace a jejich data, média a jiné soubory. Po zašifrování musíte při každém zapnutí tabletu vložit číselný kód PIN nebo heslo, abyste ho opět dešifrovali. Zašifrování tabletu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data."\n\n"Proces šifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte tablet připojený ke zdroji napájení, dokud se šifrování nedokončí. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Můžete zašifrovat své účty, nastavení, stažené aplikace a jejich data, média a jiné soubory. Po zašifrování musíte při každém zapnutí telefonu vložit číselný kód PIN nebo heslo, abyste ho opět dešifrovali. Zašifrování telefonu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data."\n\n"Proces zašifrování trvá hodinu i více. Začnete s nabitou baterií a ponechte telefon připojený ke zdroji napájení, dokud nebude šifrování dokončeno. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovat tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovat telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabijte baterii a zkuste to znovu."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Připojte nabíječku a zkuste to znovu."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Chybí heslo nebo kód PIN zámku obrazovky"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Před začátkem šifrování musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Před začátkem šifrování musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrdit šifrování"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Šifrovat tablet? Tato operace se nedá vrátit, a pokud ji přerušíte, budou data ztracena. Šifrování může trvat více než hodinu. Během této doby se tablet několikrát restartuje."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Šifrovat telefon? Tato operace se nedá vrátit, a pokud ji přerušíte, budou vaše data ztracena. Šifrování může trvat více než hodinu. Během této doby se telefon několikrát restartuje."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zkuste to znovu za: <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadejte heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrování se nezdařilo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Šifrování bylo přerušeno a nelze je dokončit. Z tohoto důvodu již nebudou údaje v tabletu přístupné. "\n\n" Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifrování bylo přerušeno a nelze je dokončit. Z tohoto důvodu již nebudou údaje v telefonu přístupné. "\n\n"Chcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v tabletu přístupné. "\n\n" Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v telefonu přístupné. "\n\n"Chcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Vybrat zámek obrazovky"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Výběr záložního zámku"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámek obrazovky"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nic"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Tažením"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Odemknutí obličejem"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečeno pomocí gesta"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zabezpečeno pomocí kódu PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Zabezpečeno pomocí hesla"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Gesto"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Heslo"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Vypnout zámek obrazovky"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odebrat bezpečnostní gesto"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odebrat bezpečnostní kód PIN"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Hudební efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitost vyzvánění"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovat v tichém režimu"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrace a vyzvánění"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrace"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Výchozí oznámení"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikat kontrolkou oznámení"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváněcí tón"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon není vložen do doku"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Nastavení připojeného doku"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok nebyl nalezen"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Chcete-li nastavit zvuk doku, musíte do něj vložit tablet."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Chcete-li nastavit zvuk doku, musíte do něj vložit telefon."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Chcete-li nastavit zvuk doku, musíte tablet vložit do doku."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Chcete-li nastavit zvuk doku, musíte telefon vložit do doku."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Zvuk při vložení do doku"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Při vložení nebo vyjmutí tabletu z doku přehrát zvuk"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Přehrát zvuk při vkládání nebo vyjímání telefonu z doku"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Chcete smazat všechny osobní informace a stažené aplikace? Tuto akci nelze vrátit zpět."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Odstranit vše"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Proveďte gesto odemknutí"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Chcete-li potvrdit obnovení továrních dat, musíte nakreslit bezpečnostní gesto."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Chcete-li potvrdit obnovení továrních dat, musíte nakreslit bezpečnostní gesto."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Pokus o obnovení se nezdařil, protože služba System Clear není dostupná."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetovat?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Smazat úložiště USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Chcete kartu SD smazat a odstranit tak všechny soubory, které jsou na ní uloženy? Tuto akci nelze vrátit zpět."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstranit vše"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Proveďte gesto odemknutí"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Smazání úložiště USB je třeba potvrdit pomocí bezpečnostního gesta."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Smazání karty SD je třeba potvrdit pomocí bezpečnostního gesta."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Smazání úložiště USB je třeba potvrdit pomocí bezpečnostního gesta."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Smazání karty SD je třeba potvrdit pomocí bezpečnostního gesta."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavení hovorů"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavení hlasové schránky, přesměrování a čekání hovorů a ID volajícího"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering pomocí USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Další"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpečení tabletu"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpečení telefonu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Svůj tablet můžete chránit před neoprávněným použitím pomocí osobního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Spojit je třeba alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Tablet můžete chránit před neoprávněným použitím pomocí osobního bezpečnostního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Je potřeba spojit alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Svůj telefon můžete chránit před neoprávněným použitím pomocí osobního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Spojit je třeba alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovat aplikace"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Umožňuje spravovat a odebírat instalované aplikace"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Velký text"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tlač. napájení ukončí hovor"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Vyslovovat hesla"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explore by touch"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Po zapnutí vám funkce Explore by Touch poskytuje zobrazený nebo hlasový popis toho, na co ukážete prstem."\n\n" Tato funkce je určena pro slabozraké uživatele."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Prodleva dotyku a podržení"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Žádná služba není nainstalována"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potřebujete čtečku obrazovky?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack poskytuje mluvenou navigaci nevidomým a slabozrakým uživatelům. Chcete tuto aplikaci stáhnout zdarma ze služby Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalovat webové skripty?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Chcete, aby aplikace nainstalovaly skripty Google, které postiženým usnadní přístup k jejich webovému obsahu?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Tato funkce mění způsob, jakým zařízení reaguje na dotyk. Chcete ji zapnout?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozici není žádný popis."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Úložiště pověření je vymazáno."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Úložiště pověření nelze smazat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Před použitím úložiště pověření musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Před použitím úložiště pověření musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Zálohování a obnovení dat"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Předsdílený klíč IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Uživatelský certifikát IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certifikát CA protokolu IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certifikát serveru IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Zobrazit rozšířené možnosti"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domény vyhledávání DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servery DNS (např. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Uložit údaje o účtu"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(nepoužíváno)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(neověřovat server)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(přijato ze serveru)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Zrušit"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Uložit"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Připojit"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Dokončit"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Přeskočit výukový program"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekce 1: Zkoumání obrazovky"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Jakmile zapnete funkci Průzkum dotykem, můžete dotykem obrazovky zjistit, co se nachází pod prstem. Příklad: Aktuální obrazovka obsahuje ikony aplikací. Dotkněte se obrazovky a posunujte prstem, dokud některou z nich nenajdete."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Pokud je funkce Průzkum dotykem zapnuta, můžete klepnutím na obrazovku zjistit, co se nachází pod prstem. Příklad: Aktuální obrazovka obsahuje ikony aplikací. Dotkněte se obrazovky a posunujte prstem, dokud některou z nich nenajdete."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobře, přejíždějte prstem po obrazovce, dokud nenajdete ještě alespoň jednu ikonu."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Chcete-li aktivovat položku, které se dotýkáte, klepněte na ni. Přejíždějte prstem, až najdete ikonu aplikace <xliff:g id="APP_NAME">%s</xliff:g>. Poté ikonu aktivujte jedním klepnutím."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Prst se nachází na ikoně aplikace <xliff:g id="APP_NAME">%s</xliff:g>. Ikonu aktivujete jedním klepnutím."</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index db4c421..b49525b 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"SD-kort, der kan fjernes"</item>
     <item msgid="4498124044785815005">"Lad systemet vælge"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Fra"</item>
-    <item msgid="4804571292609523335">"Vibrer"</item>
-    <item msgid="595707141547423573">"Lyd fra"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Altid"</item>
+    <item msgid="6293147072807231256">"Aldrig"</item>
+    <item msgid="1276641209451816572">"Kun, når lydløs er slået til"</item>
+    <item msgid="8418930333779132418">"Kun, når lydløs er slået fra"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index caaac3d..39f6961 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Det indtastede værtsnavn er ikke gyldigt."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Den indtastede udeladelsesliste er ikke korrekt formateret. Indtast en kommasepareret liste over udeladte domæner."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du skal udfylde portfeltet."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Du skal udfylde portfeltet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Den indtastede port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din tablet, hver gang du tænder for den"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din telefon, hver gang du tænder for den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypteret"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din tablet, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan dekryptere den ved at foretage en nulstilling til fabriksdata. Dette sletter alle dine data."\n\n"Krypteringen tager en time eller mere. Du skal starte med et opladet batteri og sørge for, at din tablet forbliver tilsluttet opladeren, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste alle eller nogle af dine data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier samt andre filer. Når du krypterer din telefon, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan dekryptere den ved at foretage en nulstilling til fabriksdata. Dette sletter alle dine data."\n\n"Krypteringen tager en time eller mere. Du skal starte med et opladt batteri og sørge for, at din telefon forbliver tilsluttet opladeren, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste alle eller nogle af dine data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din tablet, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun dekryptere din tablet ved at udføre en nulstilling af fabriksdata, som sletter alle dine data"\n\n"Krypteringen tager en time eller mere. Du skal starte med et opladet batteri og sørge for, at din tablet forbliver tilsluttet, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste nogle af eller alle dine data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din telefon, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun  dekryptere din telefon ved at udføre en nulstilling af fabriksdata, som sletter alle dine data."\n\n"Krypteringen tager en time eller mere. Du skal starte med et opladet batteri og sørge for, at din telefon forbliver tilsluttet, indtil kryptering er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste nogle af eller alle dine data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lad dit batteri op, og prøv igen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tilslut din oplader, og prøv igen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen pinkode eller adgangskode til skærmlås"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Du skal angive en pinkode eller adgangskode for skærmlås, inden du kan starte krypteringen."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du skal angive en pinkode eller adgangskode for skærmlås, inden du kan starte krypteringen."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekræft kryptering"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vil du kryptere tabletten? Denne handling kan ikke laves om og kan ikke afbrydes uden tab af data til følge. Krypteringen kan tage en time eller mere, og i den tid vil tabletten genstartes flere gange."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vil du kryptere telefonen? Denne handling kan ikke laves om og kan ikke afbrydes uden tab af data til følge. Krypteringen kan tage én time eller mere, og i den tid vil tabletten genstartes flere gange."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Indtast din adgangskode"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykkedes"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Krypteringen blev afbrudt, og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af din  tablet, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Krypteringen blev afbrudt, og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af telefonen, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af din  tablet, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af telefonen, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Vælg skærmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vælg backuplås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skærmlås"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Træk fingeren hen over"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ansigtslås"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sikret med mønster"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Sikret med PIN-kode"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Sikret med adgangskode"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Mønster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Pinkode"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Adgangskode"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå skærmlås fra"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern mønster til at låse op"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern pinkode til at låse op"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Lydstyrke for opkald"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved lydløs"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrer og ring"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibration"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standardunderretning"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkende meddelelseslys"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen er ikke tilsluttet dockingstationen"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Indstillinger for den dockingstation der er tilsluttet"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dockingstationen blev ikke fundet"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Du skal docke telefonen, før du konfigurerer docklyde."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Du skal docke telefonen, før du konfigurerer docklyden."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du skal docke telefonen, før du konfigurerer docklyden."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Du skal docke telefonen, før du konfigurerer docklyden."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Lyd ved isætning i dockingstation"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Afspil lyd, når tabletcomputeren isættes og fjernes fra dockingstation"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Afspil lyd, når telefonen isættes og fjernes fra dockingstation"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vil du slette alle dine personlige oplysninger og downloadede apps? Denne handling kan ikke fortrydes!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Slet alt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn dit oplåsningsmønster"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Du skal tegne dit mønster til at låse op for at bekræfte, at tabletcomputeren nulstilles."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du nulstille?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slet USB-lager"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vil du rydde SD-kortet og alle dets filer? Handlingen kan ikke fortrydes!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slet alt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Tegn dit oplåsningsmønster"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette USB-lageret."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette SD-kortet."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette USB-lagringen."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Indstillinger for opkald"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Opsæt voicemail, viderestilling af opkald, ventende opkald, opkalds-id"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Næste"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sådan beskytter du din tabletcomputer"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Beskyt din telefon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Beskyt din tablet mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug din finger til at forbinde punkterne vilkårligt på den næste skærm. Du skal forbinde mindst fire punkter."\n\n"Er du klar? Tryk på \"Næste\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskyt din tablet mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug din finger til at forbinde punkterne vilkårligt på den næste skærm. Du skal forbinde mindst fire punkter."\n\n"Er du klar? Tryk på Næste."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug fingeren til at forbinde mindst fire punkter i vilkårlig rækkefølge på næste skærmbillede. "\n\n"Når du er klar til at begynde, trykker du på Næste."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerede apps"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tænd/sluk afbryder opkald"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Indtal adgangskoder"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Udforsk ved berøring"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Når Udforsk med berøring er slået til, kan du høre eller se beskrivelser af, hvad der er under din finger."\n\n"Denne funktion er til brugere med dårligt syn."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Tryk og hold nede"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Der er ikke installeret nogen tjenester"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Har du brug for en skærmoplæser?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack giver talefeedback for at hjælpe blinde og svagtseende brugere. Vil du installere det gratis fra Android Marked?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vil du installere webscripts?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Skal apps installere scripts fra Google, som gør deres webindhold mere tilgængeligt?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Denne funktion ændrer enhedens reaktion på tryk. Vil du aktivere den?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivelse til rådighed."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Oplysningslagring er slettet."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Loginlageret kan ikke ryddes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Oplysningslagring er aktiveret."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Du skal angive en pinkode eller adgangskode til skærmlåsen, før du kan bruge lageret for loginoplysninger."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du skal angive en pinkode eller adgangskode til skærmlåsen, før du kan bruge lageret for loginoplysninger."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Angiv adfærd ved nødopkald"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sikkerhedskopiering og nulstilling"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPsec-forhåndsdelt nøglekodning"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-brugercertifikat"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA-certifikat"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec-servercertifikat"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Vis avancerede indstillinger"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-søgedomæner"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-servere (f.eks 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Gem kontooplysninger"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"bruges ikke"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ingen bekræftelse af serveren)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(modtaget fra serveren)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Annuller"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Gem"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Tilslut"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Afslut"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Spring selvstudium over"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lektion 1: Udforskning af skærmen"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Når du aktiverer \"Udforsk med berøring\", kan du trykke på skærmen for at se, hvad der vises under din finger. Den aktuelle skærm indeholder f.eks. appikoner. Find et af ​​dem ved at trykke på skærmen og køre rundt med fingeren."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Når Udforsk med berøring er slået til, kan du trykke på skærmen for at lære, hvad der vises under din finger. Det aktuelle skærmbillede indeholder f.eks. appikoner. Find et af ​​dem ved at trykke på skærmen og lade fingeren glide rundt."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Godt. Bliv ved med at glide fingeren rundt på skærmen, indtil du finder mindst ét ikon mere."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Hvis du vil aktivere noget, som du rører ved, skal du trykke kort på det. Glid med fingeren, indtil du finder ikonet for <xliff:g id="APP_NAME">%s</xliff:g>. Tryk derefter på ikonet én gang for at aktivere det."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Din finger rører ved <xliff:g id="APP_NAME">%s</xliff:g>-ikonet. Tryk én gang for at aktivere ikonet."</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 3c7bc32..aa80ce6 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Austauschbare SD-Karte"</item>
     <item msgid="4498124044785815005">"Auswahl durch das System"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Aus"</item>
-    <item msgid="4804571292609523335">"Vibrieren"</item>
-    <item msgid="595707141547423573">"Stummschalten"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Immer"</item>
+    <item msgid="6293147072807231256">"Nie"</item>
+    <item msgid="1276641209451816572">"Nur im Lautlos-Modus"</item>
+    <item msgid="8418930333779132418">"Außer im Lautlos-Modus"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0b61d1c..3e05a9b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Der eingegebene Hostname ist ungültig."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Die von Ihnen eingegebene Ausschlussliste ist nicht richtig formatiert. Bitte geben Sie eine durch Kommas getrennte Liste ausgeschlossener Domains ein."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Sie müssen das Feld für den Port ausfüllen."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Sie müssen das Feld für den Port ausfüllen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Der eingegebene Port ist ungültig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, darf aber nicht von anderen Apps verwendet werden."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Eine numerische PIN oder ein Passwort einrichten, mit dem das Tablet beim Einschalten entschlüsselt werden muss."</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Eine numerische PIN oder ein Passwort einrichten, mit dem das Telefon beim Einschalten entschlüsselt werden muss."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Tablets müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Tablets nur durch Zurücksetzen auf Werkseinstellungen aufheben, wobei alle auf dem Tablet befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Tablet muss eingesteckt bleiben, bis die Verschlüsselung abgeschlossen ist. Wenn Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Telefons müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Telefons nur durch Zurücksetzen auf die Werkseinstellungen aufheben, wobei alle auf ihm befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Gerät muss eingesteckt bleiben, bis die Verschlüsselung abgeschlossen ist. Wenn Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Sie können Ihre Konten, Einstellungen, heruntergeladene Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Tablets ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Tablets nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht."\n\n"Die Verschlüsselung dauert eine Stunde oder länger. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Tablet angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Sie können Ihre Konten, Einstellungen, heruntergeladene Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Telefons ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Telefons nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht."\n\n"Die Verschlüsselung dauert eine Stunde oder mehr. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Telefon angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon verschlüsseln"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laden Sie Ihren Akku auf und versuchen Sie es erneut."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Schließen Sie Ihr Ladegerät an und versuchen Sie es erneut."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Keine PIN oder kein Passwort für Bildschirmsperre"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Sie müssen eine PIN oder ein Passwort für die Bildschirmspeere festlegen, bevor Sie die Verschlüsselung starten können."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sie müssen eine PIN oder ein Passwort für die Bildschirmsperre festlegen, bevor Sie die Verschlüsselung starten können."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Verschlüsselung bestätigen"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Tablet verschlüsseln? Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Tablet mehrfach neu gestartet."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Telefon verschlüsseln? Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Telefon mehrfach neu gestartet."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Versuchen Sie es in <xliff:g id="DELAY">^1</xliff:g> Sekunden erneut."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Geben Sie Ihr Passwort ein."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Verschlüsselung fehlgeschlagen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Tablet nicht mehr möglich. "\n\n"Damit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Tablet nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Telefon nicht mehr möglich. "\n\n"Damit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Telefon nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Tablet nicht mehr möglich. "\n\n"Damit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Tablet nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Telefon nicht mehr möglich. "\n\n"Damit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Telefon nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Sperre auswählen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Ersatzsperre wählen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bildschirmsperre"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Keine"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Finger bewegen"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Durch Muster geschützt"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Durch PIN geschützt"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Durch Passwort geschützt"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Muster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Passwort"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Display-Sperre deaktivieren"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Entsperrungs-PIN entfernen"</string>
@@ -415,7 +415,7 @@
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"In der Regel 0000 oder 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Möglicherweise müssen Sie diese PIN auch auf dem anderen Gerät eingeben."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Möglicherweise müssen Sie diesen Schlüssel auch auf dem anderen Gerät eingeben."</string>
-    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@446b7920)  -->
+    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@b749757)  -->
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pairing mit diesem Gerät durchführen?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Geben Sie zum Pairing mit <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ein und drücken Sie anschließend die Eingabetaste."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Kopplung durchführen"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Klingeltonlautstärke"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlos-Modus vibrieren"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrieren und klingeln"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibration"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standardbenachrichtigung"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Klingelton"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon nicht angedockt"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Einstellungen für angeschlossenes Dock"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock nicht gefunden"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Zum Einrichten des Dock-Audios muss das Tablet angedockt sein."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Zum Einrichten des Dock-Audios muss das Telefon angedockt sein."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Zum Einrichten des Dock-Audios muss das Tablet angedockt sein."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Zum Einrichten des Dock-Audios muss das Telefon angedockt sein."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Ton bei Dock-Anschluss"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Beim Anschließen oder Trennen des Tablets vom Dock Sound abspielen"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Beim Anschließen oder Trennen des Telefons vom Dock Ton abspielen"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Alle persönlichen Daten und heruntergeladenen Apps löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles löschen"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, da der Dienst zur Systembereinigung nicht verfügbar ist."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zurücksetzen?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-Speicher löschen"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD-Karte und alle darauf gespeicherten Dateien löschen? Die Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles löschen"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Sie müssen Ihr Entsperrungsmuster zeichnen, um die Löschung des USB-Speichers zu bestätigen."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Sie müssen Ihr Entsperrungsmuster zeichnen, um das Löschen der SD-Karte zu bestätigen."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Sie müssen Ihr Entsperrungsmuster zeichnen, um die Löschung des USB-Speichers zu bestätigen."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Sie müssen Ihr Entsperrungsmuster zeichnen, um das Löschen der SD-Karte zu bestätigen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Anrufeinstellungen"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-Tethering"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Weiter"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sichern Ihres Tablets"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Telefon sichern"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Schützen Sie Ihr Tablet vor unbefugtem Zugriff: Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger."\n\n"Bereit? Tippen Sie auf \"Weiter\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Schützen Sie Ihr Tablet vor unbefugtem Zugriff: Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger."\n\n"Bereit? Tippen Sie auf \"Weiter\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Schützen Sie Ihr Telefon vor unbefugtem Zugriff! Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger. "\n\n"Bereit? Dann tippen Sie auf \"Weiter\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Großer Text"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Ein/Aus beendet Anruf"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Passwörter aussprechen"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Tippen &amp; Entdecken"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Wenn die Funktion \"Tippen und Entdecken\" aktiviert ist, hören oder sehen Sie Beschreibungen Ihrer Aktionen."\n\n" Diese Funktion ist für Nutzer mit geringem Sehvermögen."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Reaktionszeit Berühren/Halten"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Keine Dienste installiert"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Benötigen Sie einen Screenreader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bietet blinden Nutzern und Nutzern mit eingeschränktem Sehvermögen gesprochenes Feedback. Möchten Sie diese Funktion kostenlos von Android Market installieren?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Webskripts installieren?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Dürfen Apps Skriptdateien von Google installieren, um Ihnen den Zugang zu ihren Inhalten zu erleichtern?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Diese Funktion ändert die Art und Weise, wie Ihr Gerät auf Berührungen reagiert. Aktivieren?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Es wurde keine Beschreibung bereitgestellt."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Speicher wurde gelöscht."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Anmeldedaten nicht gelöscht"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Zur Verwendung des Anmeldeinformationsspeichers müssen Sie eine PIN oder ein Passwort für die Bildschirmsperre festlegen."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Zur Verwendung des Anmeldeinformationsspeichers müssen Sie eine PIN oder ein Passwort für die Bildschirmsperre festlegen."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sichern &amp; zurücksetzen"</string>
@@ -1525,8 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Vorinstallierter IPSec-Schlüssel"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-Nutzerzertifikat"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec-CA-Zertifikat"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"Erweiterte Optionen einblenden"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-Suchdomains"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-Server (z. B. 8.8.8.8)"</string>
@@ -1536,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Kontoinformationen speichern"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(nicht verwendet)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(Server nicht überprüfen)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"Abbrechen"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Speichern"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Verbinden"</string>
@@ -1561,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Beenden"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Überspringen"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lektion 1: Touchscreen-Erkundung"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Nachdem Sie \"Tippen &amp; Entdecken\" aktiviert haben, können Sie den Bildschirm berühren und erfahren, was sich unter Ihrem Finger befindet. Momentan enthält der Bildschirm beispielsweise Symbole für Apps. Finden Sie eines davon, indem Sie den Bildschirm berühren und den Finger darüber bewegen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Wenn \"Tippen &amp; Entdecken\" aktiviert ist, können Sie den Bildschirm berühren, um zu erfahren, was sich unter Ihren Fingern befindet. Momentan enthält der Bildschirm beispielsweise Symbole für Apps. Suchen Sie jetzt eine App, indem Sie den Bildschirm berühren und den Finger darüber bewegen."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Gut. Bewegen Sie den Finger weiter über den Bildschirm, um mindestens ein weiteres Symbol zu finden."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Tippen Sie auf ein etwas, das Sie berühren, um es zu aktivieren. Bewegen Sie den Finger, bis Sie das Symbol für <xliff:g id="APP_NAME">%s</xliff:g> gefunden haben. Tippen Sie dann darauf, um es zu aktivieren."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ihr Finger befindet sich auf dem <xliff:g id="APP_NAME">%s</xliff:g>-Symbol. Tippen Sie ein Mal, um das Symbol zu aktivieren."</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 5bd385e..9569a39 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Αφαιρούμενη κάρτα SD"</item>
     <item msgid="4498124044785815005">"Να αποφασίζει το σύστημα"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Απενεργοποιημένη"</item>
-    <item msgid="4804571292609523335">"Δόνηση"</item>
-    <item msgid="595707141547423573">"Σίγαση"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Πάντα"</item>
+    <item msgid="6293147072807231256">"Ποτέ"</item>
+    <item msgid="1276641209451816572">"Μόνο στην αθόρυβη λειτουργία"</item>
+    <item msgid="8418930333779132418">"Μόνο όταν δεν είναι ενεργή η αθόρυβη λειτουργία"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Σύντομο"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 72c9a6b..d83680e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Το όνομα κεντρικού υπολογιστή που πληκτρολογήσατε δεν είναι έγκυρο."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Η λίστα εξαιρέσεων που έχετε πληκτρολογήσει δεν έχει μορφοποιηθεί σωστά. Πληκτρολογήστε τους τομείς που θέλετε να εξαιρεθούν, χωρίζοντάς τους με κόμμα."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Πρέπει να συμπληρώσετε το πεδίο θύρας."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Θα πρέπει να συμπληρώσετε το πεδίο θύρας."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Το πεδίο θύρας θα πρέπει να είναι κενό αν το πεδίο κεντρικού υπολογιστή είναι κενό."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Η θύρα που πληκτρολογήσατε δεν είναι έγκυρη."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ο διακομ. μεσολ. HTTP χρησιμοποιείται από το πρόγρ. περιήγ., αλλά δεν πρέπει να χρησιμοποιείται από άλλες εφαρμογές."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του tablet κάθε φορά που το ενεργοποιείτε"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του τηλεφώνου σας κάθε φορά που το ενεργοποιείτε"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Κρυπτογραφημένο"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Μπορείτε να κάνετε κρυπτογράφηση λογαριασμών, ρυθμίσεων, εφαρμογών των οποίων έχετε πραγματοποιήσει λήψη και των δεδομένων, των μέσων και άλλων αρχείων τους. Μόλις κρυπτογραφήσετε το tablet σας, θα πρέπει να εισαγάγετε έναν αριθμητικό κωδικό PIN ή έναν κωδικό πρόσβασης για να το αποκρυπτογραφείτε κάθε φορά που το ενεργοποιείτε: δεν μπορείτε να αποκρυπτογραφήσετε το tablet σας, εκτός αν κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μία ώρα ή περισσότερο. Πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και το tablet σας θα πρέπει να παραμείνει συνδεδεμένο μέχρι να ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία της κρυπτογράφησης, θα χάσετε όλα ή κάποια από τα δεδομένα σας."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Μπορείτε να κάνετε κρυπτογράφηση λογαριασμών, ρυθμίσεων, εφαρμογών των οποίων έχετε πραγματοποιήσει λήψη και των δεδομένων, των μέσων και άλλων αρχείων τους. Μόλις κρυπτογραφήσετε το τηλέφωνο σας, θα πρέπει να εισαγάγετε έναν αριθμητικό κωδικό PIN ή έναν κωδικό πρόσβασης για να το αποκρυπτογραφείτε κάθε φορά που το ενεργοποιείτε: δεν μπορείτε να αποκρυπτογραφήσετε το τηλέφωνό σας, εκτός αν κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μία ώρα ή περισσότερο. Πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και το τηλέφωνό σας θα πρέπει να παραμείνει συνδεδεμένο μέχρι να ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία της κρυπτογράφησης, θα χάσετε όλα ή κάποια από τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές που έχετε λάβει και τα δεδομένα τους, τα μέσα και άλλα αρχεία. Μόλις ενεργοποιήσετε την κρυπτογράφηση στο tablet σας, θα πρέπει κάθε φορά που το ενεργοποιείτε, να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του: δεν είναι δυνατή η αποκρυπτογράφηση του tablet σας, εκτός και αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η διαδικασία κρυπτογράφησης διαρκεί μία ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη, ενώ το tablet σας θα πρέπει να είναι διαρκώς συνδεδεμένο σε μια πρίζα, έως ότου ολοκληρωθεί η διαδικασία κρυπτογράφησης. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές που έχετε λάβει και τα δεδομένα τους, τα μέσα και άλλα αρχεία. Μόλις ενεργοποιήσετε την κρυπτογράφηση στο τηλέφωνό σας, θα πρέπει κάθε φορά που το ενεργοποιείτε, να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του: δεν είναι δυνατή η αποκρυπτογράφηση του τηλεφώνου σας, εκτός και αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η διαδικασία κρυπτογράφησης διαρκεί μία ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη, ενώ το τηλέφωνό σας θα πρέπει να είναι διαρκώς συνδεδεμένο σε μια πρίζα, έως ότου ολοκληρωθεί η διαδικασία κρυπτογράφησης. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Κρυπτογράφηση τηλεφώνου"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Φορτίστε την μπαταρία σας και δοκιμάστε ξανά."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Συνδέστε τον φορτιστή σας και δοκιμάστε ξανά."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Δεν υπάρχει κωδικός PIN ή κωδικός πρόσβασης κλειδώματος οθόνης"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Πρέπει να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης προτού αρχίσει η κρυπτογράφηση."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Πρέπει να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης προτού αρχίσει η κρυπτογράφηση."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Επιβεβαίωση κρυπτογράφησης"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Κρυπτογράφηση tablet; Αυτή η λειτουργία είναι μη αναστρέψιμη και αν τη διακόψετε θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μία ώρα και περισσότερο, κατά τη διάρκεια της οποία το tablet θα κάνει επανεκκίνηση πολλές φορές."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Κρυπτογράφηση τηλεφώνου; Αυτή η λειτουργία είναι μη αναστρέψιμη και αν τη διακόψετε θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μία ώρα και περισσότερο, κατά τη διάρκεια της οποία το τηλέφωνο θα κάνει επανεκκίνηση πολλές φορές."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Προσπαθήστε ξανά σε <xliff:g id="DELAY">^1</xliff:g> δευτερόλεπτα."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Πληκτρολογήστε τον κωδικό πρόσβασής σας"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Η κρυπτογράφηση απέτυχε"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. "\n\n" Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. "\n\n"Για να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. "\n\n" Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από το Λογαριασμό σας Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. "\n\n"Για να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Επιλογή κλειδ. οθόνης"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Επιλ. εφεδρ. κλειδώμ."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδ.οθόν."</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Κανένα"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Ολίσθηση"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Έχει ασφαλιστεί με μοτίβο"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Έχει ασφαλιστεί με PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Έχει ασφαλιστεί με κωδικό πρόσβασης"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Μοτίβο"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Κωδικός πρόσβασης"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Απενεργοποίηση κλειδώματος οθόνης"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Κατάργηση μοτίβου ξεκλειδώματος"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Κατάργηση αριθμού PIN ξεκλειδώματος"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Μουσικά εφέ"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου ειδοποίησης"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Δόνηση στο αθόρυβο"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Δόνηση και κουδούνισμα"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Δόνηση"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Προεπιλεγμένη ειδοποίηση"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Φωτεινός παλμός ειδοποίησης"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ήχος κλήσης"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Το τηλέφωνο δεν βρίσκεται στη βάση σύνδεσής του"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ρυθμίσεις για τη συνδεδεμένη βάσης σύνδεσης"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Η βάση σύνδεσης δεν βρέθηκε"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Θα πρέπει να συνδέσετε το tablet πριν από τη ρύθμιση του ήχου της βάσης σύνδεσης."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Θα πρέπει να συνδέσετε το τηλέφωνο πριν από τη ρύθμιση του ήχου της βάσης σύνδεσης."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Θα πρέπει να συνδέσετε το tablet πριν από τη ρύθμιση του ήχου της βάσης σύνδεσης."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Θα πρέπει να συνδέσετε το τηλέφωνο πριν από τη ρύθμιση του ήχου της βάσης σύνδεσης."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Ήχος κατά την εισαγωγή στη βάση σύνδεσης"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Να αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του tablet από τη βάση σύνδεσης"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Να αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του τηλεφώνου από τη βάση σύνδεσης"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές; Δεν μπορείτε να αναστρέψετε αυτήν την ενέργεια!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Διαγραφή όλων"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση επαναφοράς tablet."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την επαναφορά στις εργοστασιακές ρυθμίσεις."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Να γίνει επαναφορά;"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Διαγρ. αποθ. χώρου USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Να γίνει διαγραφή της κάρτας SD, με την οποία θα διαγραφούν όλα τα αρχεία που έχετε αποθηκεύσει εκεί; Αυτή η ενέργεια είναι μη αναστρέψιμη!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Διαγραφή όλων"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να κάνετε διαγραφή του αποθηκευτικού χώρου USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να κάνετε διαγραφή της κάρτας SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να διαγράψετε το χώρο αποθήκευσης USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να διαγράψετε την κάρτα SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ρυθμίσεις κλήσης"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ορισμ.αυτόμ.τηλεφ., προώθ.κλήσης, αναμ.κλήσης, αναγν.κλήσ."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Πρόσδεση USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Επόμενο"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ασφάλεια του tablet σας"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Ασφάλιση του τηλεφώνου σας"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Προστατέψτε το tablet σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Χρησιμοποιήστε το δάχτυλό σας για να συνδέσετε τις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. Πρέπει να συνδέσετε τουλάχιστον τέσσερις τελείες. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Προστατέψτε το tablet σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Σύρετε το δάχτυλό σας για να συνδέσετε τις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. Πρέπει να συνδέσετε τουλάχιστον τέσσερις τελείες. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Προστατέψτε το τηλέφωνό σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Σύρετε το δάχτυλό σας για να συνδέσετε τουλάχιστον τέσσερις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Διαχείριση εφαρμογών"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Σύστημα"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Μεγάλο κείμενο"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Το κουμπί λειτουργίας τερματίζει την κλήση"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Εκφώνηση κωδικών πρόσβασης"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Εξερεύνηση μέσω αφής"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Όταν η Εξερεύνηση μέσω αφής είναι ενεργοποιημένη, μπορείτε να ακούσετε ή να δείτε περιγραφές για το τι είναι κάτω από το δάχτυλό σας. "\n" "\n" Αυτή η δυνατότητα αφορά χρήστες με προβλήματα όρασης."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Καθυστέρηση παρατεταμένου αγγίγματος"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Χρειάζεστε έναν αναγνώστη οθόνης;"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Το TalkBack παρέχει σχόλια σε μορφή ομιλίας για να διευκολύνει χρήστες με προβλήματα όρασης. Θέλετε να το εγκαταστήσετε δωρεάν από το Android Market;"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Να γίνει εγκατάσταση σεναρίων ιστού;"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Θέλετε να οι εφαρμογές να εγκαταστήσουν σενάρια από την Google που διευκολύνουν την πρόσβαση στο περιεχόμενο ιστού που έχουν;"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Αυτή η λειτουργία αλλάζει τον τρόπο απόκρισης της συσκευής σας στα αγγίγματα. Να ενεργοποιηθεί;"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Δεν υπάρχει περιγραφή."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Ο αποθ. χώρος διαπιστ. διαγρ."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Αδυν. διαγρ. αποθ. χώρ. διαπιστ."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Ο χώρος αποθήκευσης διαπιστευτηρίων ενεργοποιήθηκε."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Πρέπει να ορίσετε έναν αριθμό PIN ή κωδικό πρόσβασης κλειδώματος οθόνης προτού χρησιμοποιήσετε τον χώρο αποθήκευσης διαπιστευτηρίων."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ρέπει να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης πριν χρησιμοποιήσετε τον χώρο αποθήκευσης διαπιστευτηρίων."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Τόνος επείγουσας ανάγκης"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Αντίγραφα ασφαλείας και επαναφορά"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Ήδη κοινόχρηστο κλειδί IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Πιστοποιητικό χρήστη IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Πιστοποιητικό CA IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Πιστοποιητικό διακομιστή IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Εμφάνιση σύνθετων επιλογών"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Τομείς αναζήτησης DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Διακομιστής DNS (π.χ. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Αποθήκευση πληροφοριών λογαριασμού"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(δεν χρησιμοποιείται)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(να μην γίνεται επαλήθευση διακομιστή)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(Λήφθηκε από το διακομιστή)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Ακύρωση"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Αποθήκευση"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Σύνδεση"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Τέλος"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Παρ.οδηγ."</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Μάθημα 1: Εξερεύνηση της οθόνης"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Αφού ενεργοποιήσετε την \"Εξερεύνηση μέσω αφής\", μπορείτε να αγγίξετε την οθόνη για να μάθετε τι βρίσκεται κάτω από το δάχτυλό σας. Για παράδειγμα, η τρέχουσα οθόνη περιέχει εικονίδια εφαρμογών. Βρείτε ένα από αυτά αγγίζοντας την οθόνη και σέρνοντας το δάχτυλό σας."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Όταν είναι ενεργοποιημένη η επιλογή \"Εξερεύνηση μέσω αφής\", μπορείτε να αγγίξετε την οθόνη για να μάθετε τι βρίσκεται κάτω από το δάχτυλό σας. Για παράδειγμα, η τρέχουσα οθόνη περιέχει εικονίδια εφαρμογών. Βρείτε ένα από αυτά αγγίζοντας την οθόνη και σέρνοντας το δάχτυλό σας."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Συνεχίστε την ολίσθηση με το δάχτυλό σας στην οθόνη, μέχρι να βρείτε τουλάχιστον ένα ακόμη εικονίδιο."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Για να ενεργοποιήσετε ένα στοιχείο που αγγίζετε, πατήστε το. Σύρετε το δάχτυλό σας έως ότου βρείτε το εικονίδιο για την εφαρμογή <xliff:g id="APP_NAME">%s</xliff:g>. Στη συνέχεια, πατήστε στο εικονίδιο μία φορά για να το ενεργοποιήσετε."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Το δάχτυλό σας αγγίζει το εικονίδιο <xliff:g id="APP_NAME">%s</xliff:g>. Πατήστε μία φορά για να ενεργοποιήσετε το εικονίδιο."</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 80642ac..ba6296a 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Removable SD card"</item>
     <item msgid="4498124044785815005">"Let the system decide"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Off"</item>
-    <item msgid="4804571292609523335">"Vibrate"</item>
-    <item msgid="595707141547423573">"Mute"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Always"</item>
+    <item msgid="6293147072807231256">"Never"</item>
+    <item msgid="1276641209451816572">"Only in Silent mode"</item>
+    <item msgid="8418930333779132418">"Only when not in Silent mode"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 54aa741..0e35172 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"The hostname that you typed isn\'t valid."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"The exclusion list that you\'ve typed isn\'t properly formatted. Type a comma-separated list of excluded domains."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"You must complete the port field."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"You need to complete the port field."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Require a numerical PIN or password to decrypt your tablet each time that you turn it on"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Require a numerical PIN or password to decrypt your phone each time that you turn it on"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you have encrypted your tablet, you must enter a numeric PIN or password to decrypt it each time you power it on: you can\'t unencrypt your tablet except by performing a factory data reset, erasing all of your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you have encrypted your phone, you must enter a numeric PIN or password to decrypt it each time you turn it on: you can\'t unencrypt your phone except by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your tablet, you need to type a numeric PIN or password to decrypt it each time that you power it on: you can\'t unencrypt your tablet except by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your phone, you need to type a numeric PIN or password to decrypt it each time that you power it on: you can\'t unencrypt your phone except by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encrypt tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encrypt phone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Please charge your battery and try again."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Please plug in your charger and try again."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No lock-screen PIN or password"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"You must set a lock-screen PIN or password before you can start encryption."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"You need to set a lock screen PIN or password before you can start encryption."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirm encryption"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Encrypt tablet? This operation is irreversible and if you interrupt it, you will lose data. Encryption takes an hour or more, during which time the tablet will restart several times."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Encrypt phone? This operation is irreversible and if you interrupt it, you will lose data. Encryption takes an hour or more, during which time the phone will restart several times."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Try again in <xliff:g id="DELAY">^1</xliff:g> seconds."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Encryption was interrupted and can\'t complete. As a result, the data on your tablet is no longer accessible. "\n\n" To resume using your tablet, you must perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Encryption was interrupted and can\'t complete. As a result, the data on your phone is no longer accessible. "\n\n"To resume using your phone, you must perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. "\n\n" To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. "\n\n"To resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Select screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Choose backup lock"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slide"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Secured with pattern"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Secured with PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Secured with password"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Pattern"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Password"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Turn off screen lock"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringer volume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrate and ring"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrate"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Default notification"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Phone not docked"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Settings for the attached dock"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock not found"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"You must dock the tablet before setting up dock audio."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"You must dock the phone before setting up dock audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"You need to dock the tablet before setting up dock audio."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"You need to dock the phone before setting up dock audio."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dock insertion sound"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Play sound when inserting or removing tablet from dock"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Play sound when inserting or removing phone from dock"</string>
@@ -693,7 +693,7 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status of the battery, network and other information"</string>
-    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Phone number, signal, etc."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"phone number, signal, etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Storage"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Storage settings"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Unmount USB storage, view available storage"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Erase all your personal information and downloaded apps? You can\'t reverse this action!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Erase everything"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Draw your unlock pattern"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"You must draw your unlock pattern to confirm a factory data reset."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"You need to draw your unlock pattern to confirm a factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No reset was performed because the System Clear service isn\'t available."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reset?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Erase USB storage"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Erase the SD card, deleting all files stored there? You can\'t reverse this action!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Erase everything"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Draw your unlock pattern"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"You must draw your unlock pattern to confirm that you want to erase the USB storage."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"You must draw your unlock pattern to confirm that you want to erase the SD card."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"You need to draw your unlock pattern to confirm that you want to erase the USB storage."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"You need to draw your unlock pattern to confirm that you want to erase the SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Call settings"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Next"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Securing your tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Securing your phone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Protect your tablet from unauthorised use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen. You must connect at least four dots. "\n\n"Ready to start? Touch Next."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protect your tablet from unauthorised use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen. You need to connect at least four dots. "\n\n"Ready to start? Touch Next."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protect your phone from unauthorised use by creating a personal screen unlock pattern. Slide your finger to connect at least four dots in any order on the next screen. "\n\n"Ready to start? Touch Next."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Large text"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Power button ends call"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Speak passwords"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explore by touch"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"When Explore by Touch is turned on, you can hear or see descriptions of what\'s under your finger."\n\n" This feature is for low-vision users."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Touch &amp; hold delay"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Need a screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack provides spoken feedback to help blind and low-vision users. Do you want to install it for free from Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Install web scripts?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Do you want apps to install scripts from Google that make their web content more accessible?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"This feature changes the way that your device responds to touch. Turn on?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Credential storage has been erased."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Credential storage couldn\'t be erased."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Credential storage is enabled."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"You must set a lock screen PIN or password before you can use credential storage."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"You need to set a lock screen PIN or password before you can use credential storage."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Backup &amp; reset"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec preshared key"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec user certificate"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA certificate"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec server certificate"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Show advanced options"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS search domains"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS servers (e.g. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Save account information"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(not used)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(don\'t verify server)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(received from server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Cancel"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Save"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Connect"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finish"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Skip tutorial"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lesson 1: Exploring the screen"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"After you\'ve turned on Explore by Touch, you can touch the screen to learn what\'s under your finger. For example, the current screen contains app icons. Find one of them by touching the screen and sliding your finger around."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"When Explore by Touch is turned on, you can touch the screen to learn what\'s under your finger. For example, the current screen contains app icons. Find one of them by touching the screen and sliding your finger around."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Good. Keep sliding your finger around the screen until you find at least one more icon."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"To activate something that you\'re touching, tap it. Slide your finger until you find the icon for the <xliff:g id="APP_NAME">%s</xliff:g>. Then tap the icon once to activate it."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Your finger is touching the <xliff:g id="APP_NAME">%s</xliff:g> icon. Tap once to activate the icon."</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 473c6ba..f58052f 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Tarjeta SD desmontable"</item>
     <item msgid="4498124044785815005">"Dejar que el sistema decida"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desactivado"</item>
-    <item msgid="4804571292609523335">"Vibrar"</item>
-    <item msgid="595707141547423573">"Silenciar"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Siempre"</item>
+    <item msgid="6293147072807231256">"Nunca"</item>
+    <item msgid="1276641209451816572">"Sólo en modo silencioso"</item>
+    <item msgid="8418930333779132418">"Sólo cuando no esté en modo silencioso."</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7db040e..486eda3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"El nombre del host que has escrito no es válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"La lista de exclusión que escribiste no está debidamente formateada. Escribe una lista de los dominios excluidos separados por comas."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Debes completar el campo de puerto."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo del puerto debe estar vacío si el campo de servidor está vacío."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El puerto que has escrito no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador usa el proxy HTTP pero tal vez las demás aplicaciones no lo usen."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesitas un PIN numérico o contraseña para descifrar tu tableta cada vez que la enciendes"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Se necesita un PIN numérico o contraseña para descifrar tu teléfono cada vez que lo enciendes"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Puedes encriptar tus cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Una vez que encriptas tu tableta debes ingresar un PIN numérico o contraseña para desencriptarla cada vez que la enciendas: no puedes desencriptar tu tableta salvo que restablezcas los datos de fábrica y borres todos tus datos."\n\n"La encriptación demora una hora o más. Debes comenzar con una batería cargada y mantener tu tableta enchufada hasta que se complete la encriptación. Si interrumpes el proceso de encriptación, perderás tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Puedes encriptar tus cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Cuando encriptas tu teléfono, debes ingresar un PIN numérico o una contraseña para descifrarlo cada vez que lo enciendas: no puedes desencriptarlo salvo que restablezcas los datos de fábrica y borres todos tus datos."\n\n"La encriptación demora una hora o más. Debes comenzar con una batería cargada y mantener tu teléfono enchufado hasta que se complete la encriptación. Si interrumpes el proceso de encriptación, perderás tus datos total o parcialmente"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado la tableta, debes ingresar un PIN o una contraseña numérica para desencriptarla cada vez que la enciendas: solo podrás deshacer la operación al restablecer los datos de fábrica y borrar todos los datos de la tableta."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener la tableta conectada hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado el teléfono, debes introducir un PIN o una contraseña numérica para desencriptarlo cada vez que lo enciendas: solo podrás deshacer la operación al restablecer los datos de fábrica y borrar todos los datos del teléfono."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener el teléfono conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga tu batería e inténtalo nuevamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Enchufa tu cargador e inténtalo nuevamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sin contraseña o PIN de pantalla de bloqueo"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Debes configurar una contraseña o PIN de pantalla de bloqueo antes de comenzar con la encriptación"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Debes configurar una contraseña o PIN de pantalla de bloqueo antes de comenzar con la encriptación."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptación"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"¿Encriptar la tableta? Esta operación es irreversible y perderás información si la interrumpes. La encriptación demora una hora o más y durante este lapso la tableta se encenderá varias veces."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"¿Encriptar el teléfono? Esta operación es irreversible y perderás información si la interrumpes. La encriptación demora una hora o más y durante este lapso el teléfono se encenderá varias veces."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Vuelve a intentarlo en <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe la contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptación incorrecta"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tableta. "\n\n" Para reanudar el uso de tu tableta, debes restablecer los datos de fábrica. Cuando configures tu tableta luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu teléfono. "\n\n" Para reanudar el uso de tu teléfono, debes restablecer los datos de fábrica. Cuando configures tu teléfono luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tableta. "\n\n" Para reanudar el uso de tu tableta, debes restablecer los datos de fábrica. Cuando configures tu tableta luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu teléfono. "\n\n"Para reanudar el uso de tu teléfono, debes restablecer los datos de fábrica. Cuando configures tu teléfono luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Elegir bloqueo pant."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Habilitar seguridad"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Asegurado con el patrón"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Asegurado con PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Asegurado con contraseña"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contraseña"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar el bloqueo de pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar el patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar el PIN de desbloqueo"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de la música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencioso"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrar y sonar"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Notificación predeterminada"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono de llamada"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"El teléfono no se encuentra en la base"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuración para la base adjunta"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No se encontró la base"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Debes acoplar la tableta antes de configurar el audio del conector."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Debes acoplar el teléfono antes de configurar el audio del conector."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Debes acoplar la tableta antes de configurar el audio del conector."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Debes acoplar el teléfono antes de configurar el audio del conector."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar el conector"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido cuando se inserte o elimine el tablet de la base."</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido al insertar o retirar el teléfono de la base."</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Deseas borrar toda tu información personal y aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Extrae tu patrón de desbloqueo"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Debes crear tu patrón de desbloqueo para confirmar un restablecimiento de fábrica del tablet."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Debes crear tu patrón de desbloqueo para confirmar que quieres restablecer los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se realizó ningún restablecimiento debido a que el servicio \"Borrar sistema\" no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Deseas borrar la tarjeta SD y todos los archivos almacenados allí? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Extrae tu patrón de desbloqueo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar el almacenamiento USB"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar el almacenamiento de la tarjeta SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar el almacenamiento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Config. de llamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje a red USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protección de tu tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Protección de tu teléfono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Protege tu tableta contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Usa el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protege tu tableta contra usos no autorizados al crear un patrón de desbloqueo de pantalla personal. Usa el dedo para unir en cualquier orden los puntos de la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protege tu teléfono contra el uso no autorizado creando un patrón de desbloqueo de pantalla personal. Usa el dedo para conectar al menos cuatro puntos en cualquier orden en la siguiente pantalla. "\n\n"¿Listo para empezar? Toca \"Siguiente\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"El botón de encendido finaliza la llamada."</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Decir contraseñas"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Exploración táctil"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Cuando la Exploración táctil está activada, puedes escuchar o ver las descripciones de lo que está debajo del dedo."\n\n" Esta función es para usuarios con discapacidad visual."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retraso entre tocar y mantener presionado"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se instaló ningún servicio."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"¿Necesitas un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack permite que los usuarios con baja visión y no videntes oigan en voz alta las acciones que realizan. ¿Deseas instalarlo gratis desde Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"¿Deseas instalar secuencias de comandos web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"¿Deseas que las aplicaciones instalen los scripts de Google que mejoran el acceso al contenido web de estas?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Esta función afecta la manera en la que tu dispositivo responde al tacto. ¿Deseas activarla?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se proporcionó ninguna descripción."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"El almacenamiento de la credencial se ha borrado."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Imposible borrar almac credenc"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de la credencial está activado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Debes establecer un PIN o contraseña de la pantalla de bloqueo antes de usar el almacenamiento de credenciales."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Debes establecer un PIN o contraseña de la pantalla de bloqueo antes de usar el almacenamiento de credenciales."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Hacer copia de seguridad &amp; restablecer"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Clave precompartida de IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificado de usuario IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificado de CA de IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certificado de servidor IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opciones avanzadas"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Dominios de búsqueda de DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores DNS (por ejemplo, 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Guardar información de la cuenta"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(no se utiliza)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(no verificar el servidor)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(enviado desde el servidor)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Cancelar"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Guardar"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Conectar"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalizar"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Omitir"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lección 1: Exploración de la pantalla"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Luego de activar Exploración táctil, puedes tocar la pantalla para saber qué hay debajo de tu dedo. Por ejemplo, la pantalla actual contiene íconos de la aplicación. Desplázate por la pantalla con un dedo para encontrar una aplicación."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Si se activó Exploración táctil, puedes tocar la pantalla para obtener información acerca de lo que se encuentra debajo de tu dedo. Por ejemplo, la pantalla actual cuenta con íconos de aplicaciones. Para buscar alguno en particular, toca la pantalla y desplázate por ella con el dedo ."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Sigue desplazando el dedo por la pantalla hasta encontrar, al menos, otro ícono más."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Para activar el contenido seleccionado, solo tienes que tocarlo. Desliza el dedo para encontrar el ícono de <xliff:g id="APP_NAME">%s</xliff:g>. Luego toca el ícono una vez para activarlo."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Tu dedo está tocando el ícono <xliff:g id="APP_NAME">%s</xliff:g>. Presiona una vez para activarlo."</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 4d77c5b..70a6319 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Tarjeta SD extraíble"</item>
     <item msgid="4498124044785815005">"Selección del sistema"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desactivar"</item>
-    <item msgid="4804571292609523335">"Vibrar"</item>
-    <item msgid="595707141547423573">"Silenciar"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Siempre"</item>
+    <item msgid="6293147072807231256">"Nunca"</item>
+    <item msgid="1276641209451816572">"Solo en modo silencio"</item>
+    <item msgid="8418930333779132418">"Si no está en modo silencio"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 199fc2f..db4ae0e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"El nombre de host introducido no es válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"La lista de exclusión que has escrito no es correcta. Introduce una lista separada por comas de dominios excluidos."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Debes completar el campo de puerto."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de puerto debe estar vacío si el campo de host también lo está."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El puerto que has introducido no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo otras aplicaciones."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicitar una contraseña o un PIN numérico para descifrar el tablet cada vez que se encienda"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicitar una contraseña o un PIN numérico para descifrar el teléfono cada vez que se encienda"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el tablet, deberás introducir un PIN numérico o una contraseña para descifrarlo cada vez que lo enciendas (solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del tablet)."\n\n"El proceso de encriptación tarda una hora aproximadamente. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el teléfono, deberás introducir un PIN numérico o una contraseña para descifrarlo cada vez que lo enciendas (solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono)."\n\n"El proceso de encriptación tarda una hora aproximadamente. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado el tablet, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas: solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del tablet."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado el teléfono, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas: solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga la batería y vuelve a intentarlo."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecta el cargador y vuelve a intentarlo."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Falta la contraseña o el PIN de la pantalla de bloqueo"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Debes establecer una contraseña o un PIN de la pantalla de bloqueo para poder iniciar el proceso de encriptación."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Debes establecer una contraseña o un PIN de la pantalla de bloqueo para poder iniciar el proceso de encriptación."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptación"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"¿Quieres encriptar el tablet? Esta operación no se puede deshacer y, si la interrumpes, perderás datos. La encriptación tarda una hora aproximadamente y el tablet se reinicia varias veces durante este proceso."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"¿Quieres encriptar el teléfono? Esta operación no se puede deshacer y, si la interrumpes, perderás datos. La encriptación tarda una hora aproximadamente y el teléfono se reinicia varias veces durante este proceso."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Espera <xliff:g id="DELAY">^1</xliff:g> segundos y vuelve a intentarlo."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe tu contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Error en la encriptación"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"El proceso de encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del tablet. "\n\n"Debes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"La encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del teléfono. "\n\n"Debes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"El proceso de encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del tablet. "\n\n"Debes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del teléfono. "\n\n"Debes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Elegir pantalla bloqueo"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Deslizar"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegida con patrón"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protegida con PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegida con contraseña"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contraseña"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueo pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar PIN de desbloqueo"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrar y sonar"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Notificación predeterminada"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Teléfono no conectado"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ajustes del conector adjunto"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No se ha encontrado el conector"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Para configurar el audio del conector, debes insertar el tablet en el conector."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Para configurar el audio del conector, debes insertar el teléfono en el conector."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Para configurar el audio del conector, debes insertar el tablet en el conector."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Para configurar el audio del conector, debes insertar el teléfono en el conector."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar dispositivo en conector"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido al insertar o extraer el tablet del conector"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido al insertar o extraer el teléfono del conector"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Quieres borrar toda tu información personal y las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuja tu patrón de desbloqueo"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Debes crear un patrón de desbloqueo para confirmar el restablecimiento de los datos de fábrica."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Debes dibujar un patrón de desbloqueo para confirmar que quieres restablecer los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Quieres borrar la tarjeta SD y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dibuja tu patrón de desbloqueo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar la tarjeta SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamadas"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar buzón, llamada en espera, desvío e identificador"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje de USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protección del tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Protección del teléfono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Protege el tablet contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Desliza el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protege el tablet contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Desliza el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protege tu teléfono contra usos no autorizados creando un patrón de desbloqueo de pantalla. Usa el dedo para unir los puntos en cualquier orden en la siguiente pantalla. "\n\n"Si estás preparado para comenzar, toca Siguiente."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Botón encendido cuelga"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Decir contraseñas"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Exploración táctil"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Si la exploración táctil está activada, puedes ver o escuchar descripciones del contenido seleccionado."\n\n" Esta función está destinada a los usuarios con discapacidad visual."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retraso pulsación prolongada"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se ha instalado ningún servicio."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"¿Necesitas un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ofrece mensajes de voz para usuarios con discapacidades visuales. ¿Quieres instalarlo de forma gratuita desde Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"¿Instalar scripts web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"¿Quieres que las aplicaciones instalen scripts de Google para mejorar la accesibilidad de su contenido?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Esta función cambia la respuesta táctil del dispositivo. ¿Activar?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se ha especificado ninguna descripción."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Almacenamiento credenciales borrado"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"No se ha podido borrar el almacenamiento de credenciales."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Para poder usar el almacenamiento de credenciales, debes establecer una contraseña o un PIN para la pantalla de bloqueo."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder usar el almacenamiento de credenciales, debes establecer una contraseña o un PIN para la pantalla de bloqueo."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Copia de seguridad"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Clave precompartida de IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificado de usuario de IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificado de CA de IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certificado del servidor IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opciones avanzadas"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Dominios de búsqueda DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores DNS (por ejemplo, 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Guardar información de la cuenta"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(no se usa)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(no verificar servidor)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(recibido desde el servidor)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Cancelar"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Guardar"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Conectar"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalizar"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Omitir"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lección 1: Cómo explorar la pantalla"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Después de activar la exploración táctil, puedes tocar la pantalla para obtener más información sobre el contenido seleccionado. Por ejemplo, en la pantalla actual hay una lista de iconos de aplicaciones. Desplázate por la pantalla con un dedo para encontrar una aplicación."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Si la exploración táctil está activada, puedes tocar la pantalla para obtener más información sobre el contenido seleccionado. Por ejemplo, en la pantalla actual hay una lista de iconos de aplicaciones. Desplázate por la pantalla con un dedo para encontrar una aplicación."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Sigue deslizando el dedo por la pantalla para encontrar, al menos, otro icono."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Para activar el contenido seleccionado, solo tienes que tocarlo. Desliza el dedo para encontrar el icono de <xliff:g id="APP_NAME">%s</xliff:g>. A continuación, toca el icono una vez para activarlo."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Estás tocando el icono de <xliff:g id="APP_NAME">%s</xliff:g>. Da un toque para activar el icono."</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 1c0ef04..da85c5f 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Eemaldatav SD-kaart"</item>
     <item msgid="4498124044785815005">"Lase süsteemil otsustada"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Väljas"</item>
-    <item msgid="4804571292609523335">"Vibreeri"</item>
-    <item msgid="595707141547423573">"Summuta"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Alati"</item>
+    <item msgid="6293147072807231256">"Mitte kunagi"</item>
+    <item msgid="1276641209451816572">"Ainult hääletus režiimis"</item>
+    <item msgid="8418930333779132418">"Ainult muus kui hääletus režiimis"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ee18af6..4170227 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Sisestatud hosti nimi on kehtetu."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Sisestatud välistusloend ei ole õigesti vormindatud. Sisestage välistatud domeenide komadega eraldatud loend."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Peate täitma pordi välja."</string>
+    <!-- outdated translation 3525734169948795417 -->     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Peate täitma pordi välja."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pordi väli peab olema tühi, kui hosti väli on tühi."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Sisestatud port on kehtetu."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
@@ -288,7 +288,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sordi ajavööndi alusel"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Kuupäev"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Kellaaeg"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Paranda näosobitust"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Lukusta automaatselt"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pärast unerežiimi"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Kuva lukustusekraanil teave omaniku kohta"</string>
@@ -306,14 +305,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli tahvelarvuti dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli telefoni dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krüpteeritud"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Krüpteerida saate kontosid, seadeid, allalaaditud rakendusi ja nende andmeid, meedia- ja muid faile. Kui olete tahvelarvuti krüpteerinud, tuleb teil selle sisselülitamisel iga kord sisestada numbriline PIN-kood või parool: tahvelarvuti saate dekrüpteerida ainult tehaseandmetele lähtestamisega, mis kustutab kõik teie andmed."\n\n"Krüpteerimine võtab tunni või rohkem. Peate alustama laetud akuga ja hoidma tahvelarvuti ühendatuna, kuni krüpteerimine on lõpetatud. Kui krüpteerimise katkestate, siis kaotate osa andmetest või kõik andmed."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meedia- ja muid faile. Kui olete oma telefoni krüpteerinud, peate selle dekrüpteerimiseks igal sisselülitamisel sisestama numbrilise PIN-koodi või parooli: krüpteerimise mahavõtmiseks tuleb telefon tehaseandmetele lähtestada, mis kustutab kõik teie andmed."\n\n"Krüpteerimine võtab tunni või rohkem. Peate alustama laetud akuga ja hoidma telefoni vooluvõrku ühendatuna, kuni krüpteerimine on lõpetatud. Kui katkestate krüpteerimise, kaotate osa andmetest või kõik andmed."</string>
+    <!-- outdated translation 923629233459331136 -->     <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Krüpteerida saate kontosid, seadeid, allalaaditud rakendusi ja nende andmeid, meedia- ja muid faile. Kui olete tahvelarvuti krüpteerinud, tuleb teil selle sisselülitamisel iga kord sisestada numbriline PIN-kood või parool: tahvelarvuti saate dekrüpteerida ainult tehaseandmetele lähtestamisega, mis kustutab kõik teie andmed."\n\n"Krüpteerimine võtab tunni või rohkem. Peate alustama laetud akuga ja hoidma tahvelarvuti ühendatuna, kuni krüpteerimine on lõpetatud. Kui krüpteerimise katkestate, siis kaotate osa andmetest või kõik andmed."</string>
+    <!-- outdated translation 923629233459331136 -->     <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Krüpteerida saate kontosid, seadeid, allalaaditud rakendusi ja nende andmeid, meedia- ja muid faile. Kui olete tahvelarvuti krüpteerinud, tuleb teil selle sisselülitamisel iga kord sisestada numbriline PIN-kood või parool: tahvelarvuti saate dekrüpteerida ainult tehaseandmetele lähtestamisega, mis kustutab kõik teie andmed."\n\n"Krüpteerimine võtab tunni või rohkem. Peate alustama laetud akuga ja hoidma tahvelarvuti ühendatuna, kuni krüpteerimine on lõpetatud. Kui krüpteerimise katkestate, siis kaotate osa andmetest või kõik andmed."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krüpteeri tahvelarvuti"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krüpteeri telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laadige akut ja proovige uuesti."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ühendage laadija ja proovige uuesti."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekraaniluku PIN-koodi või parooli ei ole"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Enne krüpteerimisega alustamist peate määrama ekraaniluku PIN-koodi või parooli."</string>
+    <!-- outdated translation 17076329416977176 -->     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Enne krüpteerimisega alustamist peate määrama ekraaniluku PIN-koodi või parooli."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Krüpteerimise kinnitamine"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Kas krüpteerida tahvelarvuti? See toiming on pöördumatu ja katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, selle aja jooksul taaskäivitub tahvelarvuti mitu korda."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Kas krüpteerida telefon? See toiming on pöördumatu ja katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, selle aja jooksul taaskäivitub telefon mitu korda."</string>
@@ -323,8 +322,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Proovige uuesti <xliff:g id="DELAY">^1</xliff:g> sekundi pärast."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Sisestage parool"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krüptimine ebaõnnestus"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Krüpteerimine katkestati ja seda ei saa lõpuni viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. "\n\n" Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontol."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Krüpteerimine katkestati ja seda ei saa lõpuni viia. Seetõttu ei pääse te enam oma telefonis olevatele andmetele juurde. "\n\n"Telefoni kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontol."</string>
+    <!-- outdated translation 6891198717505120682 -->     <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krüpteerimine katkestati ja seda ei saa lõpuni viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. "\n\n" Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontol."</string>
+    <!-- outdated translation 6891198717505120682 -->     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krüpteerimine katkestati ja seda ei saa lõpuni viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. "\n\n" Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontol."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Ekraaniluku valimine"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valige varukoopia lukk"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekraanilukk"</string>
@@ -336,7 +335,7 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Lohistamine"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Turvamata"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Näotuvastuse avamine"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Madal turvalisus, katseline"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Muster"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Keskmine turvalisus"</string>
@@ -347,10 +346,10 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Keelanud admin., krüptimiseeskiri või mand. mälu"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Puudub"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Lohistamine"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Mustriga turvatud"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN-koodiga turvatud"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Parooliga turvatud"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Näotuvastuse avamine"</string>
+    <!-- outdated translation 464022606293547390 -->     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Mustriga turvatud"</string>
+    <!-- outdated translation 1379365142708807163 -->     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-koodiga turvatud"</string>
+    <!-- outdated translation 6955742995327081060 -->     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parooliga turvatud"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Lülita ekraanilukk välja"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eemalda avamismuster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eemalda avamise PIN-kood"</string>
@@ -594,7 +593,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Muusikaefektid"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Helina helitugevus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreeri hääletus režiimis"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibreerimine ja helin"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibreering"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Vaikimisi teade"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuv teatise tuli"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Helin"</string>
@@ -623,8 +622,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon dokkimata"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ühendatud doki seaded"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dokki ei leitud"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Peate enne doki heli seadistamist tahvelarvuti dokkima."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Peate enne doki heli seadistamist telefoni dokkima."</string>
+    <!-- outdated translation 9015625921245904495 -->     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Peate enne doki heli seadistamist tahvelarvuti dokkima."</string>
+    <!-- outdated translation 9015625921245904495 -->     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Peate enne doki heli seadistamist tahvelarvuti dokkima."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dokki sisestamise heli"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Esita heli tahvelarvuti sisestamisel dokki või sellest eemaldamisel"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Esita heli telefoni sisestamisel dokki või sellest eemaldamisel"</string>
@@ -645,15 +644,13 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustapilt"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekraanikaunistus"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Kui seade on vooluvõrgus, rakendub ekraanisäästja pärast unerežiimi lülitumist"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Keelatud"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valitud kaunistus"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveerimisaeg"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pärast seda, kui seade on olnud tegevusetu <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mitte kunagi"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Proovige"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Rakendub ka siis, kui seade on dokitud"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Androidi unelmad"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ekraanisäästjad ja muud jõude ümbersuunamised"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Valitud unistus"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Aktiveerimisaeg"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> kulutatud jõude"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Mitte kunagi"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Proovige seda!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fondi suurus"</string>
@@ -823,7 +820,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Kas kustutada kogu teie isiklik teave ja allalaaditud rakendused? Seda toimingut ei saa tagasi võtta."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Kustuta kõik"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Joonistage oma avamismuster"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Tehaseandmete lähtestamise kinnitamiseks peate koostama avamismustri."</string>
+    <!-- outdated translation 2234954758550554549 -->     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Tehaseandmete lähtestamise kinnitamiseks peate koostama avamismustri."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Lähtestust ei tehtud, sest süsteemi kustutamise teenus pole saadaval."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Kas lähtestada?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Kustuta USB-mäluseade"</string>
@@ -838,8 +835,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Kas soovite SD-kaardi tühjendada, kustutades kõik sinna salvestatud failid? Toimingut ei saa tagasi võtta."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Kustuta kõik"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Joonistage oma avamismuster"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USB-mäluseadme kustutamise kinnitamiseks peate koostama avamismustri."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SD-kaardi kustutamise kinnitamiseks peate koostama avamismustri."</string>
+    <!-- outdated translation 1379736318750958338 -->     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB-mäluseadme kustutamise kinnitamiseks peate koostama avamismustri."</string>
+    <!-- outdated translation 1379736318750958338 -->     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"USB-mäluseadme kustutamise kinnitamiseks peate koostama avamismustri."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Kõneseaded"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Seadista kõnepost, kõne edastamine, ootel kõne, helistaja ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB jagamine"</string>
@@ -887,6 +884,9 @@
     <string name="copyright_title" msgid="865906688917260647">"Autoriõigus"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsents"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nõuded ja tingimused"</string>
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Süsteemi õpetused"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Vaadake, kuidas oma tahvelarvutit kasutada"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Vaadake, kuidas oma telefoni kasutada"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Avatud lähtekoodiga litsentsid"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Litsentside laadimisega on probleem."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laadimine ..."</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Järgmine"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tahvelarvuti turvaliseks muutmine"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Telefoni turvaliseks muutmine"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Kaitske oma tahvelarvutit volitamata kasutamise eest, luues ekraani avamiseks isikliku mustri. Järgmisel ekraanil ühendage sõrmega punktid mis tahes järjekorras. Peate ühendama vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
+    <!-- outdated translation 1075370160667458122 -->     <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Kaitske oma tahvelarvutit volitamata kasutamise eest, luues ekraani avamiseks isikliku mustri. Järgmisel ekraanil ühendage sõrmega punktid mis tahes järjekorras. Peate ühendama vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Kaitske oma telefoni volitamata kasutamise eest, luues ekraani isikliku avamismustri. Järgmisel ekraanil ühendage sõrmega mis tahes järjekorras vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installitud rakenduste haldamine ja eemaldamine"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Süsteem"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Suur tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Toitenupp lõpetab kõne"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Öelge paroolid"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Puudutusega uurimine"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kui teenus Explore by Touch on sisse lülitatud, kuulete või näete kirjeldust selle kohta, mis on teie sõrme all."\n\n" See funktsioon on mõeldud kehva nägemisega kasutajatele."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Puudutage ja hoidke viivitust"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ühtki teenust pole installitud"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Kas vajate ekraanilugejat?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack esitab tagasiside suulise kõnena, mis aitab pimedaid ja vaegnägijaid. Kas soovite selle Android Marketist tasuta installida?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Kas soovite veebiskriptid installida?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Kas lubate rakendustel installida Google\'ist pärinevaid skripte, mis muudavad veebisisu kättesaadavamaks?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Funktsioon muudab seda, kuidas seade puudutustele reageerib. Kas soovite sisse lülitada?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Kirjeldust ei ole sisestatud."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Mandaatide mälu kustutatakse."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Mand. mälu ei saanud kustut."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Mandaadi mälu on lubatud."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Peate enne mandaadi mälu kasutamist määrama lukustusekraani PIN-koodi või parooli."</string>
+    <!-- outdated translation 6048426197489058494 -->     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Peate enne mandaadi mälu kasutamist määrama lukustusekraani PIN-koodi või parooli."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hädaabitoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Määra käitumine hädaabikõne korral"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Varundamine ja lähtestamine"</string>
@@ -1429,9 +1427,6 @@
     <string name="sync_item_title" msgid="1931551540462877488">"Sünkroonimine: <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ei saa käsitsi sünkroonida"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Selle üksuse sünkroonimine on praegu keelatud. Seade muutmiseks lülitage ajutiselt sisse taustaandmed ja automaatne sünkroonimine."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G seaded"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Seadistage ja hallake 4G võrku ning modemit"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-aadress"</string>
     <string name="enter_password" msgid="4131758584074246224">"Mälu dekrüpteerimiseks sisestage parool"</string>
     <string name="try_again" msgid="4272075051293936921">"Proovige uuesti."</string>
     <string name="service_busy" msgid="2325014135156127705">"Teenus on hõivatud. Proovige uuesti."</string>
@@ -1525,7 +1520,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSeci eeljagatud võti"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSeci kasutaja sertifikaat"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSeci CA-sertifikaat"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Serveri IPSeci sertifikaat"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Kuva täpsemad valikud"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-i otsingudomeenid"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-serverid (nt 8.8.8.8)"</string>
@@ -1535,7 +1529,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Salvesta kontoteave"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ei kasutata)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ära kinnita serverit)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(serverist saadud)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Tühista"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salvesta"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Ühenda"</string>
@@ -1559,7 +1552,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Lõpeta"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Jäta õpet."</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Õppetund 1: ekraaniga tutvumine"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Pärast valiku „Puudutusega uurimine” sisselülitamist saate ekraanil puudutatu kohta teavet. Näiteks praegusel ekraanil on rakenduste ikoonid. Leidke üks neist, puudutades ekraani ja libistades sõrme."</string>
+    <!-- outdated translation 477937585801538951 -->     <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Pärast valiku „Puudutusega uurimine” sisselülitamist saate ekraanil puudutatu kohta teavet. Näiteks praegusel ekraanil on rakenduste ikoonid. Leidke üks neist, puudutades ekraani ja libistades sõrme."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Väga hea. Libistage sõrme ekraanil ringi, kuni leiate veel vähemalt ühe ikooni."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Kui soovite aktiveerida seda, mida puudutate, siis koputage sellel. Libistage sõrme, kuni leiate rakenduse <xliff:g id="APP_NAME">%s</xliff:g> ikooni. Seejärel puudutage ikooni üks kord selle aktiveerimiseks."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Teie sõrm puudutab rakenduse <xliff:g id="APP_NAME">%s</xliff:g> ikooni. Ikooni aktiveerimiseks puudutage üks kord."</string>
@@ -1578,5 +1571,4 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Varukoopia määramine"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Tühista"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Süsteemi lisavärskendused"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index d71d5d7..c0eefab 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"کارت SD جدا شدنی"</item>
     <item msgid="4498124044785815005">"سیستم تصمیم بگیرد"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"خاموش"</item>
-    <item msgid="4804571292609523335">"لرزش"</item>
-    <item msgid="595707141547423573">"بیصدا کردن"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"همیشه"</item>
+    <item msgid="6293147072807231256">"هرگز"</item>
+    <item msgid="1276641209451816572">"فقط در حالت ساکت"</item>
+    <item msgid="8418930333779132418">"فقط زمانی که در حالت ساکت نباشد"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5265fb4..68fe294 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"تأیید"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"نام میزبانی که وارد کرده‌اید معتبر نیست."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"لیست موارد استثنایی که تایپ کردید به نحو صحیح قالب‌بندی نشده است. لطفاً لیستی از دامنه‌های استثنای جدا شده با کاما را تایپ کنید."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"باید قسمت درگاه را پر کنید."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"باید قسمت درگاه را پر کنید."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"اگر قسمت میزبان خالی است، قسمت درگاه باید خالی باشد."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"درگاهی که وارد کردید معتبر نیست."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"از پروکسی HTTP توسط مرورگرها استفاده می‌شود اما ممکن است توسط برنامه‌های دیگر استفاده نشود."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"هر بار که رایانه لوحی خود را روشن می کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"هر بار که تلفن خود را روشن می کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"رمز گذاری شده"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آنها، رسانه‌ها و سایر فایل‌ها را رمزگذاری کنید. پس از رمزگذاری رایانه لوحی خود، هر بار که آن را روشن می‌کنید باید پین عددی یا گذرواژه را برای رمزگشایی آن وارد کنید: امکان لغو رمزگذاری رایانه لوحی وجود ندارد مگر آنکه آن را به داده‌های کارخانه بازنشانی کنید، که تمام داده‌های شما را حذف می‌کند."\n\n"رمزگذاری یک ساعت یا بیشتر طول می‌کشد. برای شروع باید باتری کاملاً شارژ شده باشد و رایانه لوحی تا زمانی که رمزگذاری کامل شود همچنان به برق وصل باشد. در صورت متوقف کردن فرآیند رمزگذاری، برخی از داده‌ها یا تمام داده‌های خود را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آنها، رسانه‌ها و سایر فایل‌ها را رمزگذاری کنید. پس از رمزگذاری گوشی خود، در هر بار روشن کردن آن باید یک پین عددی یا گذرواژه را برای رمزگشایی آن وارد کنید: امکان لغو رمزگذاری گوشی وجود ندارد مگر آنکه آن را به داده‌های کارخانه بازنشانی کنید، که تمام داده‌های شما را حذف می‌کند."\n\n"رمزگذاری یک ساعت یا بیشتر طول می‌کشد. برای شروع باید باتری کاملاً شارژ شده باشد و تلفن تا زمانی که رمزگذاری کامل شود همچنان به برق وصل باشد. در صورت متوقف کردن فرآیند رمزگذاری، برخی یا همه داده‌های خود را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که رایانه لوحی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود: شما به هیچ وجه نمی‌توانید رمزگذاری رایانه لوحی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند."\n\n"عملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. شما باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و رایانه لوحی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که گوشی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود: شما به هیچ وجه نمی‌توانید رمزگذاری گوشی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند."\n\n"عملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. شما باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و گوشی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"رمزگذاری رایانه لوحی شخصی"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"رمزگذاری گوشی"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"باتری خود را شارژ کرده و دوباره امتحان کنید."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"شارژر خود را متصل کرده و دوباره امتحان کنید."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"هیچ پین قفل صفحه یا رمز ورودی وجود ندارد"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"قبل از شروع به رمزگذاری باید یک پین قفل صفحه یا رمز ورود تنظیم کنید."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"قبل از شروع به رمزگذاری باید یک پین قفل صفحه یا گذرواژه تنظیم کنید."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"تأیید رمزگذاری"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"رایانه لوحی رمزگذاری شود؟ این عملیات غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می کشد که در طول آن، رایانه لوحی چندین بار راه اندازی مجدد می شود."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"تلفن رمزگذاری شود؟ این عملیات غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می کشد که در طول آن، تلفن چندین بار راه اندازی مجدد می شود."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"پس از <xliff:g id="DELAY">^1</xliff:g> ثانیه دوباره امتحان کنید."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"گذرواژه خود را تایپ کنید"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"رمزگذاری ناموفق"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانه لوحی شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از رایانه لوحی خود، باید تنظیمات کارخانه را مجدداً بازنشانی کنید. با تنظیم کردن رایانه لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخه پشتیبان تهیه شده بازیابی کنید."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را مجدداً بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخه پشتیبان تهیه شده بازیابی کنید."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانه لوحی شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از رایانه لوحی خود، باید تنظیمات کارخانه را بازنشانی کنید. با تنظیم کردن رایانه لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخه پشتیبان تهیه شده بازیابی کنید."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"رمزگذاری متوقف شد و امکان تکمیل آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخه پشتیبان تهیه شده بازیابی کنید."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"انتخاب قفل صفحه"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"قفل پشتیبان را انتخاب کنید"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"قفل صفحه"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"هیچکدام"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"اسلاید"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"ایمن شده با الگو"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"محافظت شده با پین"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"ایمن شده با رمز ورود"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"الگو"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"پین"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"گذرواژه"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"خاموش کردن قفل صفحه"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"حذف الگوی بازگشایی قفل"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"حذف پین بازگشایی قفل"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"جلوه‌های موسیقی"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"میزان صدای زنگ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"لرزش در حالت بیصدا"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"لرزش و زنگ"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"لرزش"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"اعلان پیش فرض"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"چراغ اعلان ضربانی"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"آهنگ زنگ"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"تلفن در جایگاه نیست"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"تنظیمات برای جایگاه وصل شده"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"جایگاه یافت نشد"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"قبل از تنظیم صدای جایگاه اتصال باید رایانه لوحی را وصل کنید."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"قبل از تنظیم صدای جایگاه اتصال باید گوشی را وصل کنید."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"قبل از تنظیم صدای جایگاه اتصال، باید رایانه لوحی را به آن وصل کنید."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"قبل از تنظیم صدای جایگاه اتصال، باید گوشی را به آن وصل کنید."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"صدای اتصال جایگاه"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"هنگام اتصال یا جدا کردن رایانه لوحی از جایگاه، صدا پخش شود"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"هنگام اتصال یا جدا کردن تلفن از جایگاه، صدا پخش شود"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"همه اطلاعات شخصی و برنامه‌های دانلود شده پاک شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"پاک کردن همه موارد"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"الگوی بازگشایی قفل خود را بکشید"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"برای تأیید بازنشانی به داده های کارخانه، باید الگوی قفل گشایی خود را بکشید."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"برای تأیید بازنشانی به داده‌های کارخانه، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"هیچ بازنشانی انجام نشد زیرا سرویس پاکسازی سیستم در دسترس نیست."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"بازنشانی؟"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"پاک کردن حافظه USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"با پاک کردن کارت SD، همه فایل‌های ذخیره شده در آنجا حذف می‌شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"پاک کردن همه موارد"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"الگوی بازگشایی قفل خود را بکشید"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"برای تأیید پاک کردن حافظه USB، باید الگوی قفل گشایی خود را بکشید."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"برای تأیید پاک کردن کارت SD، باید الگوی قفل گشایی خود را بکشید."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"برای تأیید پاک کردن حافظه USB، باید الگوی قفل گشایی خود را بکشید."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"برای تأیید پاک کردن کارت SD، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"تنظیمات تماس"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"تنظیم پست صوتی، هدایت تماس، انتظار تماس، شناسه تماس گیرنده"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"اتصال داده با سیم USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"بعدی"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"محافظت از رایانه لوحی خود"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"حفظ امنیت تلفن شما"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از رایانه لوحی خود در برابر استفاده غیر مجاز محافظت کنید. با استفاده از انگشت خود، در صفحه بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید. "\n\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"با ایجاد یک الگوی شخصی باز کردن قفل صفحه، از رایانه لوحی خود در برابر استفاده غیر مجاز محافظت کنید. با کشیدن انگشت خود، در صفحه بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید. "\n\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از گوشی خود در برابر استفاده غیر مجاز محافظت کنید. با استفاده از انگشت خود، در صفحه بعدی حداقل 4 نقطه را با ترتیب دلخواه متصل کنید. "\n\n"آماده شروع هستید؟ \"بعدی\" را لمس کنید."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"مدیریت برنامه‌ها"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"مدیریت و حذف برنامه‌های نصب شده"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"سیستم"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"متن بزرگ"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"دکمه روشن/خاموش به تماس پایان می‌دهد"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"گفتن گذرواژه‎ها"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"کاوش با لمس"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"هنگامی که کاوش با لمس فعال باشد، می‌توانید توضیحات مواردی را که زیر انگشتتان است ببینید یا بشنوید."\n\n" این قابلیت برای استفاده کاربران با بینایی کم است."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"تأخیر لمس کردن و نگه داشتن"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"سرویسی نصب نشده است"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"به صفحه‌خوان نیاز دارید؟"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback یک بازخورد شفاهی برای کمک به کاربران نابینا و کم‌بینا ارائه می‌دهد. آیا می‌خواهید آن را به صورت رایگان از Android Market نصب کنید؟"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"اسکریپت‌های وب نصب شوند؟"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"آیا میخواهید برنامه‌های کاربردی، اسکریپت‌ها را از Google نصب کنند که امکان دسترسی به محتوای وب آنها بیشتر شود؟"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"این ویژگی روش واکنش دستگاه شما به لمس را تغییر می‌دهد. روشن شود؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"توضیحی ارائه نشده است."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"حافظه اطلاعات کاربری پاک شد."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"حافظه اطلاعات کاربری پاک نمی‌شود."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"ذخیره سازی اطلاعات کاربری فعال شد."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"باید یک پین قفل صفحه یا گذرواژه را قبل از استفاده از حافظه اطلاعات کاربری تنظیم کنید."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"باید یک پین قفل صفحه یا گذرواژه را قبل از استفاده از حافظه اطلاعات کاربری تنظیم کنید."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"آهنگ اضطراری"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"واکنش موجود در هنگام برقراری تماس اضطراری را تنظیم کنید"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"تهیه نسخه پشتیبان و بازیابی"</string>
@@ -1525,8 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"کلید IPSec از پیش مشترک شده"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"گواهی کاربر IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"گواهی IPSec CA"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"نمایش گزینه‌های پیشرفته"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"دامنه های جستجوی DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"سرور DNS (به عنوان مثال 8.8.8.8)"</string>
@@ -1536,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"ذخیره اطلاعات حساب"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(استفاده نشده)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(سرور تأیید نشود)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"لغو"</string>
     <string name="vpn_save" msgid="4233484051644764510">"ذخیره"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"اتصال"</string>
@@ -1561,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"پایان"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"رد شدن از برنامه آموزشی"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"درس 1: کاوش در صفحه"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"پس از روشن کردن \"کاوش‌ با لمس\"، می‌توانید صفحه را برای آشنایی با آنچه زیر انگشتتان است لمس کنید. به عنوان مثال، صفحه فعلی حاوی نمادهای برنامه است. یکی از آنها را با لمس صفحه و لغزاندن انگشت خود به اطراف پیدا کنید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"هنگامی که \"کاوش با لمس\" روشن است، می توانید صفحه را لمس کنید تا متوجه شوید که چه چیزهایی در زیر انگشت شماست. بعنوان مثال صفحه کنونی دارای چندین نماد برنامه است. با لمس کردن صفحه و کشیدن انگشت خود به اطراف یکی از آنها را پیدا کنید."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"خوب است. برای پیدا کردن حداقل یک نماد بیشتر، همچنان انگشت خود را روی صفحه گذاشته و در اطراف بکشید."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"برای فعال کردن چیزی که در حال لمس آن هستید، بر روی آن ضربه بزنید. برای یافتن نماد <xliff:g id="APP_NAME">%s</xliff:g> انگشت خود را حرکت دهید. سپس بر روی نماد یکبار ضربه بزنید تا آن را فعال کنید."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"درحالی که انگشت شما نماد <xliff:g id="APP_NAME">%s</xliff:g> را لمس می‌کند، یک بار ضربه بزنید تا فعال شود."</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 70ba5ca..c436cb1 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Poistettava SD-kortti"</item>
     <item msgid="4498124044785815005">"Anna järjestelmän päättää"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Pois käytöstä"</item>
-    <item msgid="4804571292609523335">"Värinä"</item>
-    <item msgid="595707141547423573">"Mykistä"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Aina"</item>
+    <item msgid="6293147072807231256">"Ei koskaan"</item>
+    <item msgid="1276641209451816572">"Vain äänettömässä tilassa"</item>
+    <item msgid="8418930333779132418">"Vain, kun puhelin ei ole äänettömässä tilassa"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lyhytelokuva"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6ca0159..31db766 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Antamasi palvelimen nimi on virheellinen."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Antamasi poissulkemisluettelo on muotoiltu virheellisesti. Anna pilkuilla erotettu poissuljettujen verkkotunnuksien luettelo."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Täytä porttikenttä."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Täytä porttikenttä."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portti-kentän täytyy olla tyhjä, jos isäntä-kenttä on tyhjä."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Antamasi portti on virheellinen."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vaatii PIN-koodin tai salasanan, jonka avulla tablet-laitteesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vaatii PIN-koodin tai salasanan, jonka avulla puhelimesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun tablet-laitteesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa tablet-laitteesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja tablet-laitteen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun puhelimesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa puhelimesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja puhelimen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun tablet-laitteesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa tablet-laitteesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja tablet-laitteen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun puhelimesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa puhelimesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja puhelimen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tablet-laite"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lataa akku ja yritä uudelleen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Yhdistä laturi ja yritä uudelleen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ei ruudunlukitus-PIN-koodia tai -salasanaa"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Aseta ruudunlukitus-PIN-koodi tai -salasana, ennen kuin voit aloittaa salauksen."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sinun täytyy asettaa lukitusruudun PIN-koodi tai salasana ennen kuin voit aloittaa salauksen."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Vahvista salaus"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Salataanko tablet-laite? Tätä toimintoa ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana tablet-laite käynnistyy uudelleen useita kertoja."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Salataanko puhelin? Tätä toimintoa ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana puhelin käynnistyy uudelleen useita kertoja."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Yritä uudelleen <xliff:g id="DELAY">^1</xliff:g> sekunnin kuluttua."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Kirjoita salasana"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Salaus epäonnistui"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Valitse ruudun lukitus"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valitse varalukko"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ruudun lukitus"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ei mitään"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Liu\'uta"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Suojattu kuviolla"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN-suojattu"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Suojattu salasanalla"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Kuvio"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-koodi"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Salasana"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Poista näytön lukitus käytöstä"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Poista lukituksenpoistokuvio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Poista lukituksen poistoon käytettävä PIN-koodi"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musiikkitehosteet"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Soittoäänen voimakkuus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Käytä värinää äänettömässä tilassa"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Värinä ja soittoääni"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Värinä"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Oletusilmoitus"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuta ilmoitusvaloa"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Soittoääni"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Puhelinta ei telakoitu"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Yhdistetyn telakan asetukset"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Telakkaa ei löydy"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Aseta tablet-laite telineeseen ennen telineen ääniasetuksien määrittämistä."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Aseta puhelin telineeseen ennen telineen ääniasetuksien määrittämistä."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Telakoi tablet-laite, jos haluat määrittää telineen äänet."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Telakoi puhelin, jos haluat määrittää telineen äänet."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Telineeseen asettamisääni"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Toista ääni, kun tablet-laite asetetaan telakkaan tai poistetaan telakasta"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Toista ääni, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Haluatko poistaa kaikki henkilökohtaiset tietosi ja lataamasi sovellukset? Toimintoa ei voi peruuttaa."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Poista kaikki"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Piirrä lukituksenpoistokuvio"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Vahvista tehdasasetuksien palauttaminen piirtämällä lukituksenpoistokuviosi."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vahvista tehdasasetusten palautus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Palauttamista ei suoritettu, koska System Clear -palvelu ei ole käytettävissä."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Palautetaanko?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Tyhjennä USB-tila"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Haluatko tyhjentää SD-kortin ja poistaa kaikki siellä olevat tiedostot? Toimintoa ei voi peruuttaa!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Poista kaikki"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Piirrä lukituksenpoistokuvio"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Varmista USB-tallennustilan tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Varmista SD-kortin tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vahvista USB-tallennustilan tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Varmista SD-kortin tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Puheluasetukset"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ota käyttöön puhelinvastaaja, soitonsiirrot, koputuspalvelu, soittajan tunnus"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Jaettu yhteys USB:n kautta"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Seuraava"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tablet-laitteen suojaaminen"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Puhelimen suojaaminen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Suojaa tablet-laitetta luvattomalta käytöltä luomalla henkilökohtainen ruudun lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet sormellasi haluamassasi järjestyksessä. Yhdistä vähintään 4 pistettä."\n\n"Oletko valmis? Kosketa Seuraava."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Suojaa tablet-laitetta luvattomalta käytöltä luomalla henkilökohtainen ruudun lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet sormellasi haluamassasi järjestyksessä. Yhdistä vähintään neljä pistettä. "\n\n"Oletko valmis? Kosketa Seuraava."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Suojaa puhelintasi luvattomalta käytöltä luomalla henkilökohtainen näytön lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet (vähintään neljä) sormellasi haluamassasi järjestyksessä."\n\n"Oletko valmis? Kosketa Seuraava."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hallinnoi ja poista asennettuja sovelluksia"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Järjestelmä"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Suuri teksti"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Virtapainike katkaisee puhelun"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Puhu salasanat"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Kosketuksella tutkiminen"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kun kosketuksella tutkiminen on käytössä, näet tai kuulet kuvauksen sormesi alla olevista kohteista."\n\n" Tämä ominaisuus on tarkoitettu näkörajoitteisille käyttäjille."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Pitkän kosketuksen viive"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ei asennettuja palveluita"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Tarvitsetko näytönlukuohjelman?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack auttaa sokeita ja näkörajoitteisia käyttäjiä puhepalautteen avulla. Haluatko asentaa sovelluksen ilmaiseksi Android Marketista?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Asennetaanko verkkokomentosarjat?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Haluatko sovellusten asentavan Googlelta ohjelmia, jotka parantavat niiden esteettömyyttä?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Tämä ominaisuus muuttaa tapaa, jolla laite reagoi kosketukseen. Otetaanko ominaisuus käyttöön?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ei kuvausta."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Käyttöoikeustietojen tallennustila on tyhjennetty."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Käyttöoik.tiet. ei poistettu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Käyttöoikeustietojen tallentaminen on käytössä."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Ruudunlukituksen PIN-koodi tai salasana on asetettava ennen kuin käyttöoikeustietojen tallennustilaa voi käyttää."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Ruudunlukituksen PIN-koodi tai salasana on asetettava ennen kuin käyttöoikeustietojen tallennustilaa voi käyttää."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hätäpuhelun ääni"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Aseta toiminta hätäpuhelun tapauksessa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Varmuuskopioi ja palauta"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Esijaettu IPSec-avain"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-käyttäjävarmenne"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec-CA-varmenne"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec-palvelinvarmenne"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Näytä lisäasetukset"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Nimipalveluhaun verkkotunnukset"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-palvelimet (esim. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Tallenna tilitiedot"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ei käytössä)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(älä vahvista palvelinta)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(palvelimelta saatu)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Peruuta"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Tallenna"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Yhdistä"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Valmis"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ohita"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Oppitunti 1: Ruudun tutkiminen"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Otettuasi Tutki koskettamalla -toiminnon käyttöön laite kertoo sinulle, mitä kosketat. Esimerkki: tämä ruutu sisältää sovelluskuvakkeita. Etsi yksi kuvakkeista koskettamalla ruutua ja liu\'uttamalla sormea ympäriinsä."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Kun Tutki koskettamalla -toiminto on käytössä, laite kertoo sinulle, mitä kosketat. Esimerkki: tämä ruutu sisältää sovelluskuvakkeita. Etsi yksi kuvakkeista koskettamalla ruutua ja liu\'uttamalla sormea ympäriinsä."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Hyvä. Jatka sormen liu\'uttamista ruudulla, kunnes löydät vielä ainakin yhden kuvakkeen."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Voit aktivoida koskettamasi kohteen napauttamalla sitä. Liu\'uta sormeasi, kunnes löydät sovelluksen <xliff:g id="APP_NAME">%s</xliff:g> kuvakkeen, ja aktivoi sovellus napauttamalla kuvaketta kerran."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Sormesi on kuvakkeen <xliff:g id="APP_NAME">%s</xliff:g> päällä. Napauta kuvaketta kerran, niin se aktivoituu."</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 27750ac..3c55c3f 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Carte SD amovible"</item>
     <item msgid="4498124044785815005">"Laisser le système décider"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Désactivé"</item>
-    <item msgid="4804571292609523335">"Vibreur"</item>
-    <item msgid="595707141547423573">"Silencieux"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Toujours"</item>
+    <item msgid="6293147072807231256">"Jamais"</item>
+    <item msgid="1276641209451816572">"En mode silencieux"</item>
+    <item msgid="8418930333779132418">"Hors mode silencieux"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ec64bba..808f96d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Le nom d\'hôte saisi n\'est pas valide."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Le format de la liste d\'exclusion spécifiée n\'est pas correct. Séparez les noms de domaine à exclure par une virgule."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Vous devez renseigner le champ Port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Le champ \"Port\" est obligatoire."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Le port indiqué n\'est pas valide."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le proxy HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer la tablette à chaque fois qu\'elle est allumée"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer le téléphone à chaque fois qu\'il est allumé"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en réinitialisant la configuration d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus et la tablette doit rester branchée jusqu\'à la fin de celui-ci. Si vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure au minimum. La batterie doit être chargée lors du démarrage du processus et le téléphone doit rester branché jusqu\'à la fin de celui-ci. Si vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en rétablissant la configuration usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus et la tablette doit rester branchée jusqu\'à la fin de celui-ci. Si vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en rétablissant la configuration usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus et le téléphone doit rester branché jusqu\'à la fin de celui-ci. Si vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Veuillez charger votre batterie, puis réessayer."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Veuillez brancher votre chargeur, puis réessayer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Aucun code PIN ni mot de passe saisi pour le verrouillage de l\'écran"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Vous devez définir un code PIN ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Vous devez définir un code PIN ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Valider le chiffrement"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Chiffrer la tablette ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le chiffrement peut prendre une heure au minimum, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Chiffrer le téléphone ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le chiffrement peut prendre une heure au minimum, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Saisissez votre mot de passe."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Échec du chiffrement"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. En conséquence, les données de votre tablette ne sont plus accessibles. "\n\n"Pour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. En conséquence, les données de votre téléphone ne sont plus accessibles. "\n\n"Pour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles."\n\n"Pour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles."\n\n"Pour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Verrouillage de l\'écran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Verrouillage secondaire"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Faire glisser"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sécurisé par un schéma"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Sécurisé par un code PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Sécurisé par mot de passe"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Schéma"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Code PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mot de passe"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Désactiver le verrouillage de l\'écran"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le code PIN de déverrouillage"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Effets musicaux"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibreur et sonnerie"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibreur"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Notification par défaut"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
@@ -605,7 +605,7 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Régler le volume pour la musique et les vidéos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarme"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Paramètres audio de la station d\'accueil associée"</string>
-    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Numérotation sonore"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Pavé de numérotation sonore"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sons des touches"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Son au verrouillage écran"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrer au toucher"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Le téléphone n\'est pas inséré dans la station d\'accueil."</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Paramètres station d\'accueil associée"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Station d\'accueil introuvable"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Vous devez placer la tablette dans la station d\'accueil avant de configurer la partie audio de la station d\'accueil."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Vous devez poser le téléphone dans sa station d\'accueil avant de configurer la partie audio de la station d\'accueil."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Vous devez poser la tablette sur la station d\'accueil avant de configurer les paramètres audio de cette dernière."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Vous devez poser le téléphone sur la station d\'accueil avant de configurer les paramètres audio de celle-ci."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Son d\'insertion dans la station d\'accueil"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Émettre un son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Émettre un son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
@@ -665,7 +665,7 @@
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Demander le code PIN pour utiliser le téléphone"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Demander le code PIN pour utiliser la tablette"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Demander le code PIN pour utiliser le téléphone"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Modifier code PIN carte SIM"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Modifier PIN carte SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Code PIN de la carte SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Verrouiller la carte SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Déverrouiller la carte SIM"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Effacer toutes vos informations personnelles et les applications téléchargées ? Cette action est irréversible."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Tout effacer"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Saisissez votre schéma de déverrouillage"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation de la configuration usine."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le rétablissement de la configuration d\'usine."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Réinitialiser ?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Effacer la mémoire USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Effacer la carte SD en supprimant tous les fichiers qu\'elle contient ? Cette action est irréversible."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Tout effacer"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dessinez votre schéma de déverrouillage"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Dessinez votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Paramètres d\'appel"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Messagerie vocale, transferts d\'appel, mise en attente, numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage connexion Bluetooth par USB"</string>
@@ -854,7 +854,7 @@
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Impossible de partager la connexion lorsqu\'une mémoire de stockage USB est utilisée."</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connecté"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erreur liée au partage de connexion via USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Via Bluetooth"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Partage connexion Bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Connexion Internet de la tablette partagée"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Connexion Internet du téléphone partagée"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Connexion Internet de la tablette partagée avec un appareil"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Suivant"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sécurisation de votre tablette"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Protégez votre tablette contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. À l\'aide de votre doigt, reliez les points dans l\'ordre de votre choix sur l\'écran suivant. Vous devez relier au moins quatre points. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protégez votre tablette contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. À l\'aide de votre doigt, reliez les points dans l\'ordre de votre choix sur l\'écran suivant. Vous devez relier au moins quatre points. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. Avec votre doigt, reliez au moins quatre points dans l\'ordre de votre choix sur l\'écran suivant. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Système"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Grands caractères"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Bouton marche/arrêt raccroche"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Énoncer les mots de passe"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explorer au toucher"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Lorsque la fonctionnalité \"Explorer au toucher\" est activée, vous pouvez entendre ou voir la description de ce qui se trouve sous vos doigts."\n\n" Celle-ci est destinée aux utilisateurs malvoyants."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Délai de pression"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Aucun service installé"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vous avez besoin d\'un lecteur d\'écran ?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fournit des commentaires audio aux personnes malvoyantes. Voulez-vous l\'installer gratuitement depuis l\'Android Market ?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Installer des scripts Web ?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Voulez-vous que les applications installent des scripts de Google pour rendre leur contenu Web plus accessible ?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Cette fonctionnalité change la façon dont votre appareil gère la saisie tactile. Voulez-vous l\'activer ?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
@@ -1220,7 +1218,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi actif"</string>
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi en cours d\'exécution"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablette"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Téléphone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Données envoyées"</string>
@@ -1262,7 +1260,7 @@
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Recherche vocale"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Clavier Android"</string>
     <string name="voice_category" msgid="1430370497125803904">"Voix"</string>
-    <string name="recognizer_title" msgid="3231385184559054457">"Saisie vocale"</string>
+    <string name="recognizer_title" msgid="3231385184559054457">"Reconnaissance vocale"</string>
     <string name="recognizer_settings_title" msgid="432493301215113154">"Recherche vocale"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Paramètres de \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Paramètres de la synthèse vocale"</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Les identifiants sont effacés."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Impossible eff. stockage identifiants."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Avant de pouvoir utiliser le stockage des identifiants, vous devez définir un code PIN ou un mot de passe d\'écran de verrouillage."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un code PIN ou un mot de passe pour le verrouillage d\'écran."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sauvegarder et réinitialiser"</string>
@@ -1465,10 +1463,10 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afficher \"L\'application ne répond plus\" pour applis en arrière-plan"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Consommation des données"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cycle de consommation"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Autoriser itinérance"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Limiter données arr.-plan"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Itinérance"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Limiter données en arrière-plan"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Utilisation 4G séparée"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Afficher conso en Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Consommation en Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afficher l\'utilisation Ethernet"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Changer le cycle..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Jour du mois de réinitialisation du cycle utilisation données :"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Clé pré-partagée IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificat utilisateur IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificat d\'autorité IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certificat de serveur IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Afficher les options avancées"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domaines de recherche DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Serveurs DNS (Ex. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Enregistrer les informations de compte"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(non utilisé)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ne pas valider le serveur)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(certificat reçu du serveur)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Annuler"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Enregistrer"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Se connecter"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Terminer"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Passer"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Leçon 1 : Découverte de l\'écran"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Après avoir activé la fonctionnalité \"Explorer au toucher\", vous pouvez appuyer sur l\'écran pour connaître l\'élément sélectionné. Par exemple, l\'écran actuel contient des icônes d\'applications. Découvrez plus d\'informations sur l\'une d\'entre elles en faisant glisser votre doigt sur l\'écran."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Une fois la fonctionnalité \"Explorer au toucher\" activée, vous pouvez appuyer sur l\'écran pour en savoir plus sur l\'élément sélectionné. Par exemple, l\'écran actuel contient des icônes d\'applications. Découvrez plus d\'informations sur l\'une d\'entre elles en faisant glisser votre doigt sur l\'écran."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Très bien. Continuez à faire glisser votre doigt sur l\'écran pour trouver au moins une autre icône."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Pour activer un élément sélectionné, appuyez dessus. Faites glisser votre doigt jusqu\'à ce que vous trouviez l\'icône <xliff:g id="APP_NAME">%s</xliff:g>, puis appuyez dessus une fois pour l\'activer."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Vous touchez l\'icône <xliff:g id="APP_NAME">%s</xliff:g>. Appuyez une fois pour l\'activer."</string>
@@ -1572,8 +1568,8 @@
     <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Très bien. Continuez à faire glisser vos doigts vers le haut pour faire défiler plus d\'éléments."</string>
     <string name="accessibility_tutorial_lesson_2_text_4" msgid="3055831259260848004">"Vous avez terminé le didacticiel. Pour le quitter, recherchez le bouton \"<xliff:g id="FINISH">%s</xliff:g>\", puis appuyez dessus."</string>
     <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correction orthographique"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Saisissez le mot de passe actuel utilisé pour les sauvegardes complètes."</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Saisissez votre nouveau mot de passe pour les sauvegardes complètes."</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Saisissez ici le mot de passe actuel utilisé pour les sauvegardes complètes."</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Saisissez ici un nouveau mot de passe pour les sauvegardes intégrales."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Confirmez ici votre nouveau mot de passe de sauvegarde complète."</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Définir le mot de passe de sauvegarde"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuler"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index b71a82a..f790b90 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"निकाले जाने योग्‍य SD कार्ड"</item>
     <item msgid="4498124044785815005">"सिस्‍टम को निर्धारित करने दें"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"बंद करें"</item>
-    <item msgid="4804571292609523335">"कंपन करें"</item>
-    <item msgid="595707141547423573">"म्यूट करें"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"हमेशा"</item>
+    <item msgid="6293147072807231256">"कभी नहीं"</item>
+    <item msgid="1276641209451816572">"केवल मौन मोड में"</item>
+    <item msgid="8418930333779132418">"जब मौन मोड में न हो, केवल तब"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d8b7a7a..f0f448e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ठीक"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"आपके द्वारा लिखा गया होस्‍टनाम मान्‍य नहीं है."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"आपके द्वारा लिखी गई बहिष्करण सूची ठीक से प्रारूपित नहीं है. बहिष्‍कृत डोमेन की अल्‍पविराम द्वारा पृथक सूची लिखें."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"आपको पोर्ट फ़ील्‍ड अवश्‍य पूर्ण करनी चाहिए."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"आपको पोर्ट फ़ील्‍ड पूर्ण करना होगा."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"यदि होस्‍ट फ़ील्‍ड रिक्त है तो पोर्ट फ़ील्‍ड को रिक्त होना ही चाहिए."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"आपके द्वारा लिखा गया पोर्ट मान्‍य नहीं है."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य एप्‍लिकेशन द्वारा उपयोग नहीं किया जा सकता."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"हर बार अपना टेबलेट चालू करते समय आपको उसे डीक्रिप्‍ट करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"हर बार अपना फ़ोन चालू करते समय आपको उसे डीक्रिप्‍ट करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एन्‍िक्रप्ट किया गया"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"आप अपने खातों, सेटिंग, डाउनलोड किए गए एप्‍लिकेशन और उनके डेटा, मीडिया एवं अन्‍य फ़ाइलों को एन्‍क्रिप्‍ट कर सकते हैं. अपना टेबलेट एन्‍क्रिप्ट करने के बाद, हर बार इसे चालू करते समय इसे डीक्रिप्‍ट करने के लिए आपको एक संख्‍यात्‍मक पिन या पासवर्ड दर्ज करना होगा: आप अपना सभी डेटा मिटाकर, फ़ैक्‍टरी डेटा रीसेट करने के अलावा किसी अन्‍य तरीके से अपने टेबलेट को अनएन्‍क्रिप्ट नहीं कर सकते."\n\n"एन्‍क्रिप्‍शन में एक घंटा या अधिक समय लगता है. आपको एक चार्ज की हुई बैटरी के साथ शुरू करना चाहिए और एन्क्रिप्शन पूरा होने तक अपने टेबलेट को प्‍लग इन करके रखना चाहिए. यदि आप एन्‍क्रिप्‍शन प्रक्रिया में बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"आप अपने खातों, सेटिंग, डाउनलोड किए गए एप्‍लिकेशन और उनके डेटा, मीडिया एवं अन्‍य फ़ाइलों को एन्‍क्रिप्‍ट कर सकते हैं. अपना फ़ोन एन्‍क्रिप्ट करने के बाद, हर बार उसे चालू करते समय उसे डीक्रिप्‍ट करने के लिए आपको एक संख्‍यात्‍मक पिन या पासवर्ड दर्ज करना होगा: आप अपना सभी डेटा मिटाकर, फ़ैक्‍टरी डेटा रीसेट करने के अलावा किसी अन्‍य तरीके से अपने फ़ोन को अनएन्‍क्रिप्ट नहीं कर सकते."\n\n"एन्‍क्रिप्‍शन में एक घंटा या अधिक समय लगता है. आपको एक चार्ज की हुई बैटरी के साथ शुरू करना चाहिए और एन्क्रिप्शन पूरा होने तक अपने फ़ोन को प्‍लग इन करके रखें. यदि आप एन्‍क्रिप्‍शन प्रक्रिया में बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना टेबलेट एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डिक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा: आप फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को अनएन्क्रिप्ट नहीं कर सकते, इससे आपका सभी डेटा मिट जाएगा."\n\n"एन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने टेबलेट को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना फ़ोन एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डिक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा: आप फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने फ़ोन को अनएन्क्रिप्ट नहीं कर सकते, इससे आपका सभी डेटा मिट जाएगा."\n\n"एन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने फ़ोन को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"अपनी बैटरी चार्ज करें और पुन: प्रयास करें."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"अपना चार्जर प्लग में लगाएं और पुन: प्रयास करें."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोई लॉक स्‍क्रीन पिन या पासवर्ड नहीं"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"एन्‍क्रिप्‍शन प्रारंभ कर सकने से पहले आपको एक लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"एन्‍क्रिप्‍शन प्रारंभ करने से पहले आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"एन्‍क्रिप्‍शन की पुष्टि करें"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"टेबलेट एन्‍क्रिप्ट करें? इस कार्रवाई को उलटा नहीं जा सकता और यदि आप इसमें बाधा डालते हैं, तो आपका डेटा खो जाएगा. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान टेबलेट कई बार पुन: प्रारंभ होगा."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"फ़ोन एन्‍क्रिप्ट करें? इस कार्रवाई को उलटा नहीं जा सकता और यदि आप इसमें बाधा डालते हैं, तो आपका डेटा खो जाएगा. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान फ़ोन कई बार पुन: प्रारंभ होगा."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> सेकंड में पुन: प्रयास करें."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"अपना पासवर्ड लिखें"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एन्क्रिप्‍शन विफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. "\n\n"अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करनी होगी. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. "\n\n"अपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करनी होगी. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"एन्‍क्रिप्‍शन बाधित किया था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. "\n\n" अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. "\n\n"अपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"स्‍क्रीन लॉक चुनें"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"बैकअप लॉक चुनें"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"स्लाइड"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"फेस अनलॉक"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"प्रतिमान से सुरक्षित"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"पिन द्वारा सुरक्षित"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"पासवर्ड से सुरक्षित"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"प्रतिमान"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"पिन"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"पासवर्ड"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"स्‍क्रीन लॉक बंद करें"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"अनलॉक प्रतिमान निकालें"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलॉक पिन निकालें"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"रिंगर वॉल्‍यूम"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"कंपन और रिंग करें"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"कंपन"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"डिफ़ॉल्ट सूचना"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"पल्‍स सूचना प्रकाश"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"फ़ोन डॉक नहीं किया गया"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"संलग्‍न किए गए डॉक के लिए सेटिंग"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"डॉक नहीं मिला"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"डॉक ऑडियो सेट करने से पहले आपको टेबलेट को डॉक करना होगा."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"डॉक ऑडियो सेट करने से पहले आपको फ़ोन डॉक करना होगा."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"डॉक ऑडियो सेट करने से पहले आपको टेबलेट को डॉक करना होगा."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"डॉक ऑडियो सेट करने से पहले आपको फ़ोन को डॉक करना होगा."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"डॉक इंसर्ट ध्‍वनि"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"डॉक में टेबलेट सम्‍मिलित करते समय या निकालते समय ध्‍वनि चलाएं"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"डॉक में फ़ोन लगाते या निकालते समय ध्‍वनि चलाएं"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"आपकी सभी निजी जानकारी और डाउनलोड किए गए एप्‍लिकेशन मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"फ़ैक्‍टरी डेटा रीसेट की पुष्टि के लिए आपको अपना अनलॉक प्रतिमान आरेखित करना होगा."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपको फ़ैक्टरी डेटा रीसेट की पुष्टि करने के लिए अपना अनलॉक प्रतिमान बनाना होगा."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करें?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB संग्रहण मिटाएं"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD कार्ड में संग्रहीत सभी फ़ाइलें हटाते हुए उसे मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"सब कुछ मिटाएं"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"आप अपने USB संग्रहण को मिटाना चाहते हैं, इसकी पुष्टि के लिए आपको अपना अनलॉक प्रतिमान आरेखित करना होगा."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"आप SD कार्ड को मिटाना चाहते हैं, इसकी पुष्टि करने के लिए आपको अपना अनलॉक प्रतिमान आरेखित करना होगा."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"आप USB संग्रहण मिटाना चाहते हैं, इसकी पुष्टि के लिए आपको अपना अनलॉक प्रतिमान बनाना होगा."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"आप SD कार्ड को मिटाना चाहते हैं, इसकी पुष्टि करने के लिए आपको अपना अनलॉक प्रतिमान बनाना होगा."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"कॉल सेटिंग"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ध्वनिमेल, कॉल अग्रेषण, कॉल प्रतीक्षा, कॉलर आईडी सेट करें"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB टेदरिंग"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"अगला"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"अपने टेबलेट को सुरक्षित करना"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"आपके फ़ोन को सुरक्षित करना"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"व्यक्तिगत स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने टेबलेट को अनधिकृत उपयोग से बचाएं. बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. आपको कम से कम चार बिंदुओं को जोड़ना होगा. "\n\n"शुरू करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"कोई निजी स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने टेबलेट को अनधिकृत उपयोग से बचाएं. बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. आपको कम से कम चार बिंदुओं को जोड़ना होगा. "\n\n"प्रारंभ करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"व्यक्तिगत स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने फ़ोन को अनधिकृत उपयोग से बचाएं. कम से कम चार बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. "\n\n"शुरू करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"एप्लिकेशन प्रबंधित करें"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्‍टॉल किए गए एप्‍लिकेशन प्रबंधित करें और निकालें"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"सिस्‍टम"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"बड़ा पाठ"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"पावर बटन कॉल बंद करता है"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"पासवर्ड बोलें"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"स्‍पर्श द्वारा अन्‍वेषण"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"जब स्‍पर्श द्वारा अन्‍वेषण चालू हो, तो आप अपनी अंगुली के नीचे के विवरण सुन सकते हैं या देख सकते हैं."\n\n" यह सुविधा कम दृष्टि वाले उपयोगकर्ताओं के लिए है."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"स्‍पर्श करके रखने का विलंब"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कोई सेवा इंस्‍टॉल नहीं है"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"किसी स्‍क्रीन रीडर की आवश्‍यकता है?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack नेत्रहीन और कम-दृष्टि वाले उपयोगकर्ताओं के लिए बोलकर फ़ीडबैक प्रदान करता है. क्‍या आप इसे Android Market से निशुल्‍क इंस्‍टॉल करना चाहते हैं?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"वेब स्‍क्रिप्ट इंस्‍टॉल करें?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"क्‍या आप चाहते हैं कि एप्लिकेशन Google से उन स्क्रिप्‍ट को इंस्‍टॉल करें जो उनकी वेब सामग्री को अधिक पहुंच योग्‍य बनाती हैं?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"यह सुविधा आपके उपकरण द्वारा स्‍पर्श का प्रतिसाद देने का तरीका बदलती है. चालू करें?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"कोई विवरण नहीं दिया गया."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"क्रेडेंशियल संग्रहण मिटा दिया गया है."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"क्रेडेंशियल संग्रहण मिटाया नहीं जा सका."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"क्रेडेंशियल संग्रहण सक्षम किया गया है."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"क्रेडेंशियल संग्रहण का उपयोग करने से पहले, आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"क्रेडेंशियल संग्रहण का उपयोग करने से पहले, आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"आपातकालीन टोन"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"बैकअप लें और रीसेट करें"</string>
@@ -1388,7 +1386,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP समर्थित नहीं है."</string>
     <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"आप सेटअप करते समय किसी EAP Wi-Fi कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
-    <!-- syntax error in translation for wifi_setup_description_connected (5235991893829582459) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:192 in java.io.StringReader@1118fa47)  -->
+    <!-- syntax error in translation for wifi_setup_description_connected (5235991893829582459) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:192 in java.io.StringReader@7eb1cc87)  -->
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec पहले से शेयर की गई कुंजी"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec उपयोगकर्ता प्रमाणपत्र"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA प्रमाणपत्र"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec सर्वर प्रमाणपत्र"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"उन्नत विकल्प दिखाएं"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS खोज डोमेन"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS सर्वर (उदा. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"खाता जानकारी सहेजें"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(उपयोग नहीं किया)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(सर्वर सत्‍यापित न करें)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्वर से प्राप्त)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"रद्द करें"</string>
     <string name="vpn_save" msgid="4233484051644764510">"सहेजें"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"कनेक्ट करें"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"समाप्त"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"ट्यूटोरियल छोड़ें"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"अध्‍याय 1: स्‍क्रीन का अन्वेषण करना"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"स्‍पर्श द्वारा अन्‍वेषण करें चालू करने के बाद, आपकी अंगुली की पहुंच में क्या है यह जानने के लि‍ए आप स्‍क्रीन को स्‍पर्श कर सकते हैं. उदाहरण के लि‍ए, वर्तमान स्‍क्रीन में एप्‍लि‍केशन आइकन हैं. स्‍क्रीन को स्‍पर्श करके और अपनी अंगुली को स्लाइड करते हुए कोई आइकन ढूंढें."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"जब स्‍पर्श द्वारा अन्‍वेषण चालू हो, तो यह जानने के लिए आप स्‍क्रीन स्‍पर्श कर सकते हैं कि आपकी अंगुली की पहुंच में क्या है. उदाहरण के लिए, वर्तमान स्‍क्रीन में एप्लिकेशन आइकन हैं. स्‍क्रीन को स्‍पर्श करके और अपनी अंगुली को स्लाइड करते हुए कोई आइकन ढूंढें."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"बढ़िया. अपनी अंगुली को स्‍क्रीन के आस-पास तब तक स्‍लाइड करते रहें, जब तक कि आपको कम से कम एक और आइकन नहीं मिल जाता."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"आपके द्वारा स्पर्श की जाने वाली चीज़ को सक्रिय करने के लिए, उसे टैप करें. अपनी अंगुली को तब तक स्लाइड करें, जब तक आपको <xliff:g id="APP_NAME">%s</xliff:g> के लिए आइकन नहीं मिल जाता. फिर उसे सक्रिय करने के लिए आइकन को एक बार टैप करें."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"आपकी अंगुली <xliff:g id="APP_NAME">%s</xliff:g> आइकन को स्‍पर्श कर रही है. आइकन सक्रिय करने के लिए एक बार टैप करें."</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 22b6d86..1a7b505 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Prijenosna SD kartica"</item>
     <item msgid="4498124044785815005">"Neka sustav odluči"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Isključeno"</item>
-    <item msgid="4804571292609523335">"Vibriraj"</item>
-    <item msgid="595707141547423573">"Isključi zvuk"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Uvijek"</item>
+    <item msgid="6293147072807231256">"Nikad"</item>
+    <item msgid="1276641209451816572">"Samo u bešumnom načinu"</item>
+    <item msgid="8418930333779132418">"Samo ako nije bešumni način"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index dbab9cc..9c38ece 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"U redu"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Naziv hosta koji ste upisali nije valjan."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Popis za isključivanje koji ste napisali nije pravilno formatiran. Unesite popis isključenih domena odvojenih zarezima."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Morate dovršiti polje priključka."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Morate dovršiti polje priključka."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Polje priključka mora biti prazno ako je i polje hosta prazno."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Upisani priključak nije valjan."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Traži brojčani PIN ili zaporku za dekripciju tablet računala svaki put kada se uključi"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Traži brojčani PIN ili zaporku za dekripciju telefona svaki put kada se uključi"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kriptirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Možete kriptirati račune, postavke, preuzete aplikacije i njihove podatke, medije i ostale datoteke. Nakon što kriptirate tabletno računalo, morate unijeti brojčani PIN ili zaporku kako biste ga dekriptirali svaki put kada ga uključite: ne možete poništiti kriptiranje ako ne vratite tabletno računalo na tvorničko stanje, što će izbrisati sve vaše podatke."\n\n"Kriptiranje traje sat vremena ili dulje. Morate ga započeti s punom baterijom, a tabletno računalo mora biti priključeno dok enkripcija ne završi. Ako prekinete proces enkripcije, izgubit ćete neke, a možda i sve podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Možete kriptirati račune, postavke, preuzete aplikacije i njihove podatke, medije i ostale datoteke. Nakon što kriptirate telefon, morate unijeti brojčani PIN ili zaporku kako biste ga dekriptirali svaki put kada ga uključite: ne možete poništiti kriptiranje ako ne vratite telefon na tvorničko stanje, što će izbrisati sve vaše podatke."\n\n"Kriptiranje traje sat vremena ili dulje. Morate ga započeti s punom baterijom, a telefon mora biti priključen dok enkripcija ne završi. Ako prekinete proces enkripcije, izgubit ćete neke, a možda i sve podatke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja tabletnog računala morate upisati numerički PIN ili zaporku kako biste  ga dešifrirali svaki put kada ga uključite: svoje tabletno računalo možete dešifrirati samo vraćanjem u tvorničko stanje čime se brišu svi vaši podaci."\n\n"Enkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i tabletno računalo držati priključeno dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja telefona morate upisati numerički PIN ili zaporku kako biste  ga dešifrirali svaki put kada ga uključite. Svoj telefon možete dešifrirati samo vraćanjem na tvorničke postavke čime se brišu svi vaši podaci."\n\n"Enkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i telefon držati priključen dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kriptiraj tablet uređaj"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kriptiraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napunite bateriju i pokušajte ponovo."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Uključite punjač i pokušajte ponovo."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nema PIN-a ili zaporke za zaključani zaslon"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Morate postaviti PIN ili zaporku za zaključani zaslon prije nego što započnete enkripciju."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Prije nego što ćete moći započeti enkripciju morat ćete postaviti PIN za zaključavanje zaslona ili zaporku."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrda enkripcije"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Kriptirati tablet računalo? Ta je operacija nepovratna i izgubit ćete podatke ako je prekinete. Kriptiranje traje sat vremena ili dulje, a za to vrijeme tablet računalo nekoliko će se puta ponovno pokrenuti."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Kriptirati telefon? Ta je operacija nepovratna i izgubit ćete podatke ako je prekinete. Kriptiranje traje sat vremena, a i dulje, tijekom kojih će se telefon nekoliko puta ponovno pokrenuti."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Pokušajte ponovo za <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Unesite svoju zaporku"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripcija neuspješna"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem tabletnom računalu više nisu dostupni. "\n\n"Da biste nastavili upotrebljavati ​​tabletno računalo, morate obaviti vraćanje na tvorničke postavke. Kada nakon toga postavite svoje tabletno računalo, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem telefonu više nisu dostupni. "\n\n"Da biste nastavili upotrebljavati ​​telefon, morate obaviti vraćanje na tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripcija je prekinuta i ne može se dovršiti. Podaci na vašem tabletnom računali zbog toga više nisu dostupni."\n\n"Da biste nastavili upotrebljavati svoje tabletno računalo, trebate provesti vraćanje u tvorničko stanje. Prilikom postavljanja tabletnog računala nakon vraćanja u tvorničko stanje imat ćete priliku vratiti sve podatke za koje ste na Google računu izradili sigurnosnu kopiju."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem telefonu više nisu dostupni. "\n\n"Da biste nastavili upotrebljavati ​​telefon, morate vratiti tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Odabir zaklj. zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Odabir sig. zaključ."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje zaslona"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Klizanje"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Otključavanje licem"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Osigurano uzorkom"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Osigurano PIN-om"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Osigurano zaporkom"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Uzorak"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Zaporka"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Isključi zaključavanje zaslona"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ukloni uzorak za otključavanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ukloni otključavanje PIN-a"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Glazbeni efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnoća zvona"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibracija ako je bešumno"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibracija i zvono"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibracija"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Zadana obavijest"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsno svjetlo obavijesti"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvuk zvona"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon nije priključen"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Postavke za priključnu stanicu"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Priključna stanica nije pronađena"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Prije postavljanja zvuka priključne stanice morate priključiti tabletno računalo na nju."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Prije postavljanja zvuka priključne stanice morate priključiti telefon na nju."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Prije postavljanja zvuka priključne stanice trebate na nju postaviti tabletno računalo."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Prije postavljanja zvuka priključne stanice trebate na nju postaviti telefon."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Zvuk priključivanja stanice"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproduciraj zvuk pri umetanju ili uklanjanju tabletnog uređaja iz priključne stanice"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproduciraj zvuk kod umetanja ili uklanjanja telefona s priključne stanice"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Izbrisati sve osobne podatke i preuzete aplikacije? Radnja se ne možete poništiti!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši sve"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Iscrtajte uzorak za otključavanje"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Morate iscrtati svoj uzorak za otključavanje da biste potvrdili vraćanje na tvorničko stanje."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Da biste potvrdili vraćanje na tvorničke postavke, trebate nacrtati svoj uzorak za otključavanje."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nije došlo do poništavanja jer nije dostupna usluga brisanja sustava."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Poništiti?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Izbriši USB memoriju"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Izbrisati SD karticu i sve pohranjene datoteke na njoj? Radnja se ne može poništiti!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Izbriši sve"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Iscrtajte uzorak za otključavanje"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Morate iscrtati uzorak za otključavanje kako biste potvrdili da želite izbrisati memoriju USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Morate iscrtati uzorak za otključavanje kako biste potvrdili da želite izbrisati karticu SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Morate iscrtati uzorak za otključavanje kako biste potvrdili da želite izbrisati USB memoriju."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebate iscrtati svoj uzorak za otključavanje kako biste potvrdili da želite izbrisati SD karticu."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Postavite govornu poštu, preusmjeravanje poziva, ID pozivatelja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Dalje"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Osiguravanje tabletnog uređaja"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Osiguravanje telefona"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Zaštitite svoje tabletno računalo od neovlaštene upotrebe stvaranjem osobnog uzorka za otključavanje zaslona. Klizite prstom po sljedećem zaslonu da biste povezali točkice bilo kojim redoslijedom. Morate povezati barem četiri točkice. "\n\n"Jeste li spremni? Dodirnite \"Dalje\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Zaštitite svoje tabletno računalo od neautorizirane upotrebe stvaranjem osobnog uzorka za otključavanje zaslona. Klizite prstom kako biste točke na zaslonu povezali bilo kojim redoslijedom. Trebate povezati najmanje četiri točke."\n\n"Jeste li spremni? Dodirnite Dalje."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Zaštitite svoj telefon od neovlaštene upotrebe izradom vlastitog uzorka za otključavanje zaslona. Na sljedećem zaslonu klizite prstom da biste spojili najmanje četiri točke bilo kojim redoslijedom. "\n\n"Spremni za početak? Dodirnite \"Dalje\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i njihovo uklanjanje"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sustav"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veliki tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tipka za uključivanje prekida poziv"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Izgovori zaporke"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Istraži dodirom"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kada se uključi Istraži dodirom, možete čuti ili vidjeti opise onoga što je pod prstom. "\n\n" Ova je značajka za slabovidne korisnike."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Dodirnite i držite odgodu"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Trebate čitač zaslona?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack daje govorne povratne informacije kao pomoć slijepim i slabovidnim korisnicima. Želite li ga besplatno instalirati s usluge Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalirati web-skripte?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Želite li da aplikacije instaliraju skripte s Googlea koje će njihov sadržaj učiniti pristupačnijim?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ova značajka mijenja način na koji uređaj reagira na dodir. Želite li je uključiti?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije dan opis."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Pohrana vjerodajnica izbrisana je."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Pohrana vjer. nije izbrisana."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohranjivanje vjerodajnica je omogućeno."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Morate postaviti PIN ili zaporku za zaključavanje zaslona kako biste mogli upotrebljavati pohranu vjerodajnica."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebate postaviti PIN ili zaporku za zaključavanje zaslona prije nego što ćete moći upotrebljavati pohranu vjerodajnica."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton hitnog poziva"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavite način ponašanja za hitan poziv"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Stvori sigurnosnu kopiju i poništi"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec unaprijed dijeljeni ključ"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec korisnički certifikat"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA certifikat"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec certifikat poslužitelja"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Prikaži napredne opcije"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domene DNS pretraživanja"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS poslužitelji (npr. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Spremi podatke o računu"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(nije upotrijebljeno)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ne potvrđuj poslužitelja)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(primljen od poslužitelja)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Odustani"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Spremi"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Poveži"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Završi"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Preskoči vodič"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekcija 1: istraživanje zaslona"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Nakon što uključite značajku \"Istražite dodirom\", možete dodirnuti zaslon da biste saznali što vam je pod prstom. Na primjer, trenutačni zaslon sadrži ikone aplikacija. Pronađite jednu od njih dodirivanjem zaslona i klizanjem prstom."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Ako je značajka Istraži dodirom uključena, možete dodirnuti zaslon da biste saznali što je pod vašim prstom. Na primjer, trenutačni zaslon sadrži ikone aplikacija. Pronađite jednu od njih dodirivanjem zaslona i klizanjem prstom."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobro, nastavite kliziti prstom po zaslonu kako biste pronašli još barem jednu ikonu."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Da biste aktivirali ono što dodirujete, dotaknite to. Klizite prstom dok ne pronađete ikonu za aplikaciju <xliff:g id="APP_NAME">%s</xliff:g>. Zatim dotaknite ikonu jedanput da biste je aktivirali."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Vaš prst dodiruje ikonu aplikacije <xliff:g id="APP_NAME">%s</xliff:g>. Dodirnite jedanput da biste aktivirali tu ikonu."</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 31c2540..5e8853e 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Eltávolítható SD-kártya"</item>
     <item msgid="4498124044785815005">"Döntse el a rendszer"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Ki"</item>
-    <item msgid="4804571292609523335">"Rezgés"</item>
-    <item msgid="595707141547423573">"Némítás"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Mindig"</item>
+    <item msgid="6293147072807231256">"Soha"</item>
+    <item msgid="1276641209451816572">"Csak Néma üzemmódban"</item>
+    <item msgid="8418930333779132418">"Csak akkor, ha nem Néma üzemmódban van"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Rövid"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4f91bfc..059731c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"A beírt gazdagépnév nem érvényes."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"A beírt kivétellista nincs jól formázva. Kérjük, vesszővel elválasztott listát írjon be a kizárt domainekről."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Ki kell töltenie a port mezőt."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Ki kell töltenie a port mezőt."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"A port mezőnek is üresnek kell maradnia, ha a gazdagép mező üres."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A megadott port nem érvényes."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"A HTTP proxyt a böngésző használja, ám más alkalmazások nem használhatják."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"A táblagép titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"A telefon titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Titkosítva"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosította táblagépét, egy számokból álló PIN kódot vagy jelszót kell megadnia minden bekapcsoláskor a titkosítás feloldásához. Táblagépe titkosítását nem tudja visszavonni, kivéve a gyári adatok visszaállításával, minden adatának törlésével."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kell elkezdenie, és táblagépét bedugva kell tartania a titkosítás befejezéséig. Ha megszakítja a titkosítási folyamatot, részben vagy egészben elveszíti adatait."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosította telefonját, egy számokból álló PIN kódot vagy jelszót kell megadnia minden bekapcsoláskor a titkosítás feloldásához. Telefonja titkosítását nem tudja visszavonni, kivéve a gyári adatok visszaállításával, minden adatának törlésével."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kell elkezdenie, és telefonját bedugva kell tartania a titkosítás befejezéséig. Ha megszakítja a titkosítási folyamatot, részben vagy egészben elveszíti adatait."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja táblagépét, akkor valahányszor bekapcsolja azt, minden alkalommal be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: táblagépének titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről. "\n" "\n" A titkosítás egy órát vagy valamivel többet vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és hagyja a hálózaton a táblagépet, amíg a titkosítás befejeződik. Ha megszakítja a titkosítási folyamatot, akkor el fogja veszíteni néhány vagy az összes adatát."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja telefonját, akkor valahányszor bekapcsolja azt, minden alkalommal be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: telefonjának titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről. "\n" "\n" A titkosítás egy órát vagy valamivel többet vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és hagyja a hálózaton a telefonját, amíg a titkosítás befejeződik. Ha megszakítja a titkosítási folyamatot, akkor el fogja veszíteni néhány vagy az összes adatát."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Táblagép titkosítása"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon titkosítása"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Töltse fel az akkumulátort, és próbálja újra."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Csatlakoztassa töltőjét, és próbálja újra."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nincs a zárolási képernyőhöz tartozó PIN kód vagy jelszó"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Be kell állítani egy zárolási képernyőhöz tartozó PIN kódot vagy jelszót a titkosítás megkezdése előtt."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Be kell állítani egy zárolási képernyőhöz tartozó PIN kódot vagy jelszót a titkosítás megkezdése előtt."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Titkosítás megerősítése"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Titkosítja a táblagépet? Ez a művelet visszafordíthatatlan, és ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a táblagép többször újra fog indulni."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Titkosítja a telefont? Ez a művelet visszafordíthatatlan, és ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a telefon többször újra fog indulni."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Próbálja újra <xliff:g id="DELAY">^1</xliff:g> másodperc múlva."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Írja be a jelszavát"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"A titkosítás sikertelen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer tárolt a Google Fiókjában."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Képernyőzár-választás"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Biztonsági zárolás"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő zárolása"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nincs"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Csúsztatás"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Arcalapú feloldás"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Mintával biztosítva"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN kóddal biztosítva"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Jelszóval biztosítva"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Minta"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kód"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Jelszó"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Képernyőzár kikapcsolása"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Feloldási minta törlése"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Feloldó PIN-kód törlése"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Zenei hatások"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Csengetés hangereje"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rezgés néma üzemmódban"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Rezgés és csengetés"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Rezgés"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Alapértelmezett értesítés"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Villogó értesítő fény"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Csengőhang"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"A telefon nincs dokkolva"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"A csatlakoztatott dokkoló beállításai"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"A dokkoló nem található"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"A dokkolási hang beállítása előtt dokkolnia kell a táblagépet."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"A dokkolás hangjának beállítása előtt dokkolnia kell a telefont."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"A dokkolás hangjának beállítása előtt dokkolnia kell a táblagépet."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"A dokkolás hangjának beállítása előtt dokkolnia kell a telefont."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dokkolási hang"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Hangjelzés a táblagép dokkba történő helyezésekor vagy onnan eltávolításakor"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Hang lejátszása a telefon dokkolóba helyezésekor és kivételekor"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Törli az összes személyes információt és letöltött alkalmazást? A műveletet nem lehet visszavonni!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Minden törlése"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rajzolja le a feloldási mintát"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Le kell rajzolnia a feloldási mintát a gyári adatok visszaállításának megerősítéséhez."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Le kell rajzolnia a feloldási mintát a gyári adatok visszaállításának megerősítéséhez."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nem történt visszaállítás, mert a Rendszertisztítás szolgáltatás nem érhető el."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Visszaállítás?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-tár törlése"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Törli az SD-kártyát, ezzel eltávolítva az összes ott tárolt fájlt? A műveletet nem lehet visszavonni!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Minden törlése"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Rajzolja le a feloldási mintát"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az USB-tárat."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az SD-kártyát."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az USB-tárat."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az SD-kártyát."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Hívásbeállítások"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hangposta, hívásátirányítás, hívásvárakoztatás és hívóazonosító beállítása"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-megosztás"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Tovább"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"A táblagép védelme"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"A telefon védelme"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Védje meg táblagépét a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kösse össze a pontokat a következő képernyőn. Legalább négy pontot össze kell kötnie. "\n\n"Készen áll? Érintse meg a Tovább gombot."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Védje meg táblagépét a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kösse össze a pontokat a következő képernyőn. Legalább négy pontot össze kell kötnie. "\n\n"Készen áll? Érintse meg a Tovább gombot."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Védje meg telefonját a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kössön össze legalább négy pontot a következő képernyőn. "\n\n"Készen áll? Érintse meg a Tovább gombot."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Alkalmazások kezelése"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Telepített alkalmazások kezelése és eltávolítása"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Rendszer"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Nagy szöveg"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"A bekapcsoló gomb megszakítja a hívást"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Jelszavak kimondása"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Felfedezés érintéssel"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Amikor be van kapcsolva a Felfedezés érintéssel funkció, akkor láthatja vagy hallhatja az ujja alatt lévő dolgok leírását."\n\n" Ez a funkció gyengén látó felhasználók számára készült."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Érintés és tartási késleltetés"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nincs telepített szolgáltatás"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Képernyőolvasóra van szüksége?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"A TalkBack beszéddel történő visszajelzést kínál vak és gyengénlátó felhasználók számára. Szeretné ingyen telepíteni az Android Marketről?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Internetes szkriptek telepítése?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Szeretné, ha az alkalmazások telepíthetnének olyan szkripteket a Google-tól, melyek révén az internetes tartalom még inkább hozzáférhetővé válik?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ez a funkció megváltoztatja, hogyan válaszol a készüléke az érintésre. Bekapcsolja?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nincs leírás."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Hit. adatok tárolója üres."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Az azonosítótárolót nem lehet törölni."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"A hitelesítési adatok tárolója engedélyezve van."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Be kell állítani a zárolási képernyő PIN kódját vagy jelszavát, mielőtt használhatja az azonosítótárolót."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Be kell állítania a zárolási képernyő PIN kódját vagy jelszavát, mielőtt használhatná az azonosítótárolót."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Segélyhívás hangja"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Viselkedés beállítása segélyhívás kezdeményezésekor"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Biztonsági mentés és visszaállítás"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Megosztott IPSec-kulcs"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec felhasználói tanúsítvány"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA tanúsítvány"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec-szervertanúsítvány"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"speciális lehetőségek megjelenítése"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS keresési domainek"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS szerverek (pl. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Számlainformáció mentése"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(nem használják)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ne ellenőrizze a szervereket)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(szervertől fogadva)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Mégse"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Mentés"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Csatlakozás"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Befejezés"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Kihagyás"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. lecke: A képernyő felfedezése"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Miután bekapcsolta a \"Felfedezés érintéssel\" funkciót, a képernyő megérintésével többet tudhat meg arról, amin az ujját tartja. Például az aktuális képernyőn alkalmazások ikonjai találhatók. Találjon meg egyet úgy, hogy megérinti a képernyőt és húzza az ujját."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Miután bekapcsolta a \"Felfedezés érintéssel\" funkciót, a képernyő megérintésével többet tudhat meg arról, amin az ujját tartja. Például az aktuális képernyőn alkalmazások ikonjai vannak. Találjon meg egyet úgy, hogy megérinti a képernyőt és húzza az ujját."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Remek. Csúsztassa tovább az ujját a képernyőn, amíg legalább még egy ikont nem talál."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Ha aktiválni szeretné azt, amihez hozzáér, koppintson rá. Csúsztassa el ujját addig, amíg meg nem találja a következő ikonját: <xliff:g id="APP_NAME">%s</xliff:g>. Ezután egyszer koppintson az ikonra annak aktiválásához."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ujja hozzáér a(z) <xliff:g id="APP_NAME">%s</xliff:g> ikonhoz. Koppintson egyszer az ikon aktiválásához."</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index cb84fe4..deeca3b 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Kartu SD yang dapat dicopot"</item>
     <item msgid="4498124044785815005">"Biarkan sistem menentukan"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Mati"</item>
-    <item msgid="4804571292609523335">"Getar"</item>
-    <item msgid="595707141547423573">"Bungkam"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Selalu"</item>
+    <item msgid="6293147072807231256">"Tidak pernah"</item>
+    <item msgid="1276641209451816572">"Hanya dalam mode senyap"</item>
+    <item msgid="8418930333779132418">"Hanya ketika tidak dalam mode Senyap"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 91444a0..02da941 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Nama inang yang Anda ketikkan tidak valid."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Daftar pengecualian yang Anda ketikkan tidak diformat dengan benar. Ketikkan daftar pengecualian domain dengan dipisahkan koma."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Anda harus melengkapi bidang port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Anda perlu melengkapi bidang port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Bidang port harus kosong jika bidang inang kosong."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang Anda ketik tidak valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh peramban, namun tidak boleh digunakan oleh apl lain."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi tablet tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi ponsel tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Dienkripsi"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Anda dapat mengenkripsi akun, setelan, apl unduhan dan datanya, media, serta berkas Anda yang lain. Setelah mengenkripsi tablet, Anda harus memasukkan PIN angka atau sandi untuk mengurai enkripsi setiap kali menghidupkannya: Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik, yang berarti menghapus semua data Anda."\n\n"Enkripsi membutuhkan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dayanya dan tablet harus tetap terhubung dengan sumber listrik hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Anda dapat mengenkripsi akun, setelan, apl unduhan dan datanya, media, serta berkas lain. Setelah mengenkripsi ponsel, Anda harus memasukkan sandi atau PIN angka untuk mengurai enkripsi setiap kali menghidupkannya: Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikannya ke setelan pabrik, yang berarti menghapus semua data Anda."\n\n"Enkripsi membutuhkan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dayanya dan ponsel harus tetap terhubung dengan sumber listrik hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta berkas lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya: Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikan ke setelan pabrik yang akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan beberapa atau seluruh data Anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta berkas lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya: Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke setelan pabrik yang akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan beberapa atau seluruh data Anda."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripsi tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripsi ponsel"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Isi daya baterai Anda dan coba lagi."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pasang pengisi daya Anda dan coba lagi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tidak ada PIN atau sandi pengunci layar"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Anda harus menyetel PIN atau sandi pengunci layar sebelum dapat memulai enkripsi."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat memulai enkripsi."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Konfirmasi enkripsi"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Enkripsi tablet? Operasi ini tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, saat itu tablet akan dimulai ulang beberapa kali."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Enkripsi ponsel? Operasi ini tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, saat itu ponsel akan dimulai ulang beberapa kali."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Coba lagi dalam <xliff:g id="DELAY">^1</xliff:g> detik."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ketikkan sandi Anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan tablet, Anda harus mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan ponsel, Anda harus mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Pilih kunci layar"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih gembok cadangan"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Gembok layar"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Geser"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Diamankan dengan pola"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Diamankan dengan PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Diamankan dengan sandi"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Pola"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Sandi"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Matikan kunci layar"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Hapus pola pembuka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Hapus PIN pembuka kunci"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efek musik"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume dering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar saat senyap"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Getar dan dering"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Getar"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Pemberitahuan bawaan"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telepon tidak berada di dok"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Setelan untuk dok terpasang"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok tidak ditemukan"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Anda harus menghubungkan tablet dengan dok sebelum menyiapkan audio dok."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Anda harus menghubungkan ponsel dengan dok sebelum menyiapkan audio dok."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Anda perlu menghubungkan tablet dengan dok sebelum menyiapkan audio dok."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Anda perlu menghubungkan ponsel dengan dok sebelum menyiapkan audio dok."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Suara pemasangan dok"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Putar suara saat memasukkan atau melepaskan tablet dari dok"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Putar suara ketika memasang atau melepas ponsel dari dok"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Hapus semua informasi pribadi dan apl unduhan Anda? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hapus semua"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Buat pola pembuka kunci Anda"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Anda harus membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke setelan pabrik."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke setelan pabrik."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setel ulang?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Hapus penyimpanan USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hapus kartu SD beserta semua berkas yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Hapus semua"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Buat pola pembuka kunci Anda"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Anda harus membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus penyimpanan USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Anda harus membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus kartu SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus penyimpanan USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus kartu SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setelan panggilan"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Siapkan kotak pesan, penerusan panggilan, nada tunggu, nomor penelepon"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Berikutnya"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Mengamankan tablet Anda"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Mengamankan ponsel Anda"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Lindungi tablet Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan titik-titik dengan sembarang urutan di layar berikutnya. Anda harus menghubungkan setidaknya empat titik. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Lindungi tablet Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan titik-titik secara acak di layar berikutnya. Anda perlu menghubungkan setidaknya empat titik. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Lindungi ponsel Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan setidaknya empat titik dengan sembarang urutan pada layar berikutnya. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kelola apl"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Teks besar"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tombol daya mengakhiri panggilan"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Ucapkan sandi"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Jelajahi dengan sentuhan"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Ketika Jelajahi dengan Sentuhan dinyalakan, Anda dapat mendengar atau melihat uraian dari apa yang ada di bawah jari Anda."\n\n" Fitur ini untuk pengguna dengan penglihatan yang tidak terlalu bagus."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Tundaan sentuh &amp; tahan"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tidak ada layanan terpasang"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlu pembaca layar?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan umpan balik lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Pasang skrip web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Apakah Anda ingin apl memasang skrip dari Google yang membuat konten webnya lebih mudah diakses?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Fitur ini mengubah cara perangkat Anda menanggapi sentuhan. Hidupkan?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia uraian."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Penyimpanan kredensial dihapus."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Penyimpanan kredensial tidak dapat dihapus."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Penyimpanan kredensial diaktifkan."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Anda harus menyetel PIN atau sandi pengunci layar sebelum dapat menggunakan penyimpanan kredensial."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat menggunakan penyimpanan kredensial."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada darurat"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setel perilaku ketika panggilan darurat dilakukan"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Buat cadangan &amp; setel ulang"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Kunci pra-bagi IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Sertifikat pengguna IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Sertifikat CA IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Sertifikat server IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Tampilkan opsi lanjutan"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domain penelusuran DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (mis. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Simpan informasi akun"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(tidak digunakan)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(jangan verifikasi server)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(diterima dari server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Batal"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Simpan"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Sambungkan"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Selesai"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Lewati tutorial"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Pelajaran 1: Menjelajahi layar"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Setelah mengaktifkan Jelajahi dengan Sentuhan, Anda dapat menyentuh layar untuk mempelajari apa yang ada di bawah jari Anda. Misalnya, layar aktif yang berisi ikon apl. Cari salah satu ikon dengan menyentuh layar dan menggeser jari Anda di sekitarnya."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Saat Jelajahi dengan Sentuhan diaktifkan, Anda dapat menyentuh layar untuk mempelajari apa yang ada di bawah jari Anda. Misalnya, layar aktif yang berisi ikon apl. Cari salah satu ikon dengan menyentuh layar dan menggeser jari Anda di sekitarnya."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bagus. Tetap geser jari Anda pada layar sampai menemukan setidaknya satu ikon lagi."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Untuk mengaktifkan sesuatu yang Anda sentuh, ketuklah. Geser jari Anda sampai Anda menemukan ikon untuk <xliff:g id="APP_NAME">%s</xliff:g>. Kemudian ketuk ikon sekali untuk mengaktifkannya."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jari Anda menyentuh ikon <xliff:g id="APP_NAME">%s</xliff:g>. Ketuk sekali untuk mengaktifkan ikon."</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index c2d2752..51cdd87 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Scheda SD rimovibile"</item>
     <item msgid="4498124044785815005">"Impostazione di sistema"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Disattivato"</item>
-    <item msgid="4804571292609523335">"Vibrazione"</item>
-    <item msgid="595707141547423573">"Disattiva audio"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Sempre"</item>
+    <item msgid="6293147072807231256">"Mai"</item>
+    <item msgid="1276641209451816572">"Solo in mod. silenziosa"</item>
+    <item msgid="8418930333779132418">"Solo se mod. silenziosa non attiva"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 282e005..4d17351 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Il nome host specificato non è valido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"L\'elenco di esclusioni digitato non è nel formato corretto. Digita un elenco di domini esclusi separati da virgole."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Inserisci un valore nel campo Porta."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Devi inserire un valore nel campo Porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Il campo Porta deve essere vuoto se il campo Host è vuoto."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"La porta specificata non è valida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Il proxy HTTP viene utilizzato dal browser ma potrebbe non essere utilizzato da altre applicazioni."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Richiedi un PIN numerico o una password per decrittografare il tablet a ogni accensione"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Richiedi un PIN numerico o una password per decrittografare il telefono a ogni accensione"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crittografato"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Puoi crittografare account, impostazioni, applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi inserire un PIN numerico o una password per decrittografarlo ogni volta che lo accendi: non è possibile decrittografarlo se non eseguendo un ripristino dati di fabbrica, cancellando tutti i dati."\n\n"La crittografia richiede almeno un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al termine. Se interrompi il processo di crittografia, perderai alcuni o tutti i tuoi dati."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Puoi crittografare account, impostazioni, applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi inserire un PIN numerico o una password per decrittografarlo ogni volta che lo accendi: non è possibile decrittografarlo se non eseguendo un ripristino dati di fabbrica, cancellando tutti i dati."\n\n"La crittografia richiede almeno un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al termine. Se interrompi il processo di crittografia, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Puoi crittografare il tuo account, le tue impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi: non puoi decrittografare il tablet se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati."\n\n"La crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Puoi crittografare il tuo account, le tue impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi: non puoi decrittografare il telefono se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati."\n\n"La crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Esegui crittografia tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Esegui crittografia telefono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carica la batteria e riprova."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Collega il caricabatterie e riprova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nessun PIN/password di blocco dello schermo"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Devi impostare un PIN o una password di blocco dello schermo per poter iniziare la crittografia."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Devi impostare un PIN o una password di blocco dello schermo per poter iniziare la crittografia."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Conferma crittografia"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Eseguire la crittografia del tablet? Questa operazione non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il tablet verrà riavviato diverse volte."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Eseguire la crittografia del telefono? Questa operazione non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il telefono verrà riavviato diverse volte."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Riprova tra <xliff:g id="DELAY">^1</xliff:g> secondi."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digita la password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Crittografia non riuscita"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. "\n\n"Per riprendere a utilizzare il tablet devi effettuare il ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. "\n\n"Per riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. "\n\n"Per riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. "\n\n"Per riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Blocco schermo"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Scegli blocco di backup"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocco schermo"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nessuno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Scorrimento"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Sblocco col sorriso"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protetto con sequenza"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protetto con PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protetto con password"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequenza"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Password"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Disattiva blocco schermo"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Rimuovi sequenza di sblocco"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Rimuovi PIN di sblocco"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Effetti musicali"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume suoneria"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra in modalità silenziosa"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrazione e suoneria"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrazione"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Notifica predefinita"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luce di notifica pulsante"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Suoneria"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefono non inserito nel dock"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Impostazioni per dock collegato"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock non trovato"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Devi inserire il tablet nel dock per poter configurare l\'audio del dock."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Devi inserire il telefono nel dock per poter configurare l\'audio del dock."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Devi inserire il tablet nel dock per poter configurare l\'audio del dock."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Devi inserire il telefono nel dock per poter configurare l\'audio del dock."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Suono inserimento nel dock"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Riproduci suono all\'inserimento o alla rimozione del tablet dal dock"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Riproduci suono all\'inserimento o alla rimozione del telefono dal dock"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Cancellare tutti i dati personali e le applicazioni scaricate? Questa azione è irreversibile."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Cancella tutto"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Inserisci la sequenza di sblocco"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Per confermare un ripristino dati di fabbrica occorre inserire la sequenza di sblocco."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Per confermare un ripristino dati di fabbrica occorre inserire la sequenza di sblocco."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reimpostare?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Cancella archivio USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Cancellare la scheda SD, eliminando tutti i file memorizzati al suo interno? Questa azione è irreversibile."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Cancella tutto"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Inserisci la sequenza di sblocco"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare l\'archivio USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare la scheda SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare l\'archivio USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare la scheda SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Impostazioni chiamate"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Avanti"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protezione del tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Protezione del telefono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Proteggi il tuo tablet dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare i pallini in qualsiasi ordine nella schermata successiva. Devi collegare almeno quattro pallini. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteggi il tuo tablet dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare i pallini in qualsiasi ordine nella schermata successiva. Devi collegare almeno quattro pallini. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteggi il tuo telefono dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare almeno quattro pallini in qualsiasi ordine nella schermata successiva. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Testo grande"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Il pulsante di accensione termina la chiamata"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Pronuncia le password"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Esplora al tocco"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quando la funzione Esplora al tocco è attiva, puoi ascoltare o visualizzare le descrizioni di ciò che si trova sotto il tuo dito."\n\n"Questa funzione è destinata a utenti ipovedenti."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Ritardo tocco e pressione"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nessun servizio installato"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Hai bisogno di uno screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fornisce commenti vocali per utenti non vedenti o con problemi di vista. Vuoi installare gratuitamente l\'applicazione da Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Installare gli script web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vuoi che le applicazioni installino script di Google per rendere più accessibili i relativi contenuti web?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Questa funzione cambia il modo in cui il dispositivo risponde al tocco. Attivarla?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nessuna descrizione fornita."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Archivio credenziali cancellato"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Impossibile cancellare archivio credenz."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'archivio di credenziali è attivo."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Devi impostare un PIN o una password di blocco dello schermo per poter utilizzare l\'archivio credenziali."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Devi impostare un PIN o una password di blocco dello schermo per poter utilizzare l\'archivio credenziali."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Backup e ripristino"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Chiave pre-condivisa IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificato IPSec dell\'utente"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificato CA per IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certificato server IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Mostra opzioni avanzate"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domini di ricerca DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (ad es. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Salva informazioni account"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(non utilizzato)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(non eseguire verifica server)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(ricevuto dal server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Annulla"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salva"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Connetti"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Fine"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Salta esercit."</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lezione 1: Esplorazione dello schermo"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Dopo avere attivato l\'esplorazione tramite tocco, puoi toccare lo schermo per sapere che cosa stai toccando. Ad esempio, la schermata corrente contiene icone di applicazioni. Trovane una toccando lo schermo e facendo scorrere il dito."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Quando la fuzione Esplora al tocco è attivata, puoi toccare lo schermo per sapere che cosa stai toccando. Ad esempio, la schermata corrente contiene icone di applicazioni. Trovane una toccando lo schermo e facendo scorrere il dito."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bene, continua a far scorrere il dito sullo schermo per trovare almeno un\'altra icona."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Per attivare l\'elemento che stai toccando, toccalo. Fai scorrere il dito finché trovi l\'icona di <xliff:g id="APP_NAME">%s</xliff:g>. Dopodiché, tocca una volta l\'icona per attivarla."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Il tuo dito sta toccando l\'icona di <xliff:g id="APP_NAME">%s</xliff:g>. Tocca una volta per attivare l\'icona."</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 8d8ea5f..dcdf1fd 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"כרטיס SD נשלף"</item>
     <item msgid="4498124044785815005">"תן למערכת להחליט"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"כבוי"</item>
-    <item msgid="4804571292609523335">"רטט"</item>
-    <item msgid="595707141547423573">"השתק"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"תמיד"</item>
+    <item msgid="6293147072807231256">"אף פעם"</item>
+    <item msgid="1276641209451816572">"במצב שקט בלבד"</item>
+    <item msgid="8418930333779132418">"רק כאשר אינו במצב שקט"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"קצר"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c3fd8ac..b292041 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"אישור"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"שם המארח שהקלדת אינו חוקי."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"רשימת אי ההכללה שהקלדת אינה בפורמט המתאים. הקלד רשימה של דומיינים שאינם נכללים, שהפריטים בה מופרדים באמצעות פסיקים."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"עליך למלא את שדה היציאה."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"עליך למלא את שדה היציאה."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"שדה היציאה חייב להיות ריק אם שדה המארח ריק."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"היציאה שהקלדת אינה חוקית."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך יישומים אחרים לא יכולים להשתמש בו."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"דורש PIN מספרי או סיסמה לפענוח הטבלט בכל הפעלה"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"דורש PIN מספרי או סיסמה לפענוח הטלפון בכל הפעלה"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"מוצפן"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"תוכל להצפין את החשבונות וההגדרות שלך, וכן את היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר הצפנת הטבלט, עליך להזין קוד PIN מספרי או סיסמה כדי לבטל את ההצפנה בכל הפעלה של הטבלט: תוכל לבטל את הצפנת הטבלט רק על ידי ביצוע איפוס נתוני יצרן, פעולה שתגרום למחיקת כל הנתונים שלך."\n\n"ההצפנה נמשכת שעה או יותר. עליך להתחיל בהצפנה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד להשלמת ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד חלק מהנתונים או את כולם."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"תוכל להצפין את החשבונות וההגדרות שלך, כמו גם את היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר הצפנת הטלפון, עליך להזין קוד PIN מספרי או סיסמה כדי לבטל את ההצפנה בכל הפעלה של הטלפון: תוכל לבטל את הצפנת הטלפון רק על ידי איפוס נתוני היצרן, פעולה שתגרום למחיקת כל הנתונים שלך."\n\n"ההצפנה נמשכת שעה או יותר. עליך להתחיל בהצפנה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד להשלמת תהליך ההצפנה. אם תפסיק את תהליך ההצפנה לפני סיומו, תאבד חלק מהנתונים או את כולם."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"אתה יכול להצפין את החשבונות שלך, את ההגדרות שלך, את היישומים שהורדת ואת הנתונים, המדיה וקבצים אחרים השייכים ליישומים. לאחר שתצפין את הטבלט שלך, תצטרך להקליד PIN מספרי או סיסמה כדי לבטל את ההצפנה בכל פעם שאתה מפעיל אותו. אתה יכול לבטל את הצפנת הטבלט שלך רק באמצעות איפוס נתוני יצרן, שמוחק את כל הנתונים. "\n\n"משך זמן ההצפנה הוא לפחות שעה. עליך להתחיל עם סוללה טעונה ולהשאיר את הטבלט מחובר עד שההצפנה מסתיימת. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"תוכל להצפין את החשבונות שלך, את ההגדרות שלך, את היישומים שהורדת ואת הנתונים, המדיה וקבצים אחרים השייכים ליישומים. ברגע שתצפין את הטלפון שלך, יהיה עליך להקליד PIN מספרי או סיסמה לשם פענוח בכל פעם שאתה מפעיל אותו. אתה יכול לבטל את הצפנת הטלפון שלך רק באמצעות איפוס נתוני יצרן, שמוחק את כל הנתונים."\n\n"משך זמן ההצפנה הוא לפחות שעה. עליך להתחיל עם סוללה טעונה ולהשאיר את הטלפון מחובר עד שההצפנה מסתיימת. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טבלט"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"הצפן טלפון"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"טען את הסוללה ונסה שוב."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"חבר את המטען ונסה שוב."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"אין PIN או סיסמה לנעילת מסך"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"עליך להגדיר PIN או סיסמה לנעילת מסך לפני שתוכל להתחיל בהצפנה."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"עליך להגדיר PIN או סיסמה לנעילת מסך כדי שתוכל להתחיל בהצפנה."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"אשר הצפנה"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"להצפין טבלט? פעולה זו היא בלתי הפיכה והפסקתה תגרום לאובדן נתונים. ההצפנה אורכת שעה או יותר, ובמהלך זמן זה הטבלט יופעל מחדש מספר פעמים."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"להצפין טלפון? פעולה זו היא בלתי הפיכה והפסקתה תגרום לאובדן נתונים. ההצפנה אורכת שעה או יותר, ובמהלך זמן זה הטלפון יופעל מחדש מספר פעמים."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"נסה שוב בעוד <xliff:g id="DELAY">^1</xliff:g> שניות."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"הקלד את הסיסמה שלך"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ההצפנה נכשלה"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטבלט שלך. "\n\n"כדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. "\n\n"כדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטבלט שלך. "\n\n"כדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס נתוני יצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תוכל לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. "\n\n"כדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"בחר נעילת מסך"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"בחר נעילת גיבוי"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"נעילת מסך"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ללא"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"הסט"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"זיהוי פרצוף"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"מאובטח עם קו"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"מאובטח עם PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"מאובטח עם סיסמה"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"קו ביטול נעילה"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"סיסמה"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"כיבוי נעילת מסך"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"הסר קו ביטול נעילה"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"הסר PIN של ביטול נעילה"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"אפקטים מוסיקליים"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"עוצמת קול של צלצול"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"רטט במצב שקט"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"רטט וצלצול"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"רטט"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"הודעת ברירת מחדל"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"תאורת התראה של אות"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"צלצול"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"הטלפון לא בעגינה"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"הגדרות עבור העגינה המצורפת"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"לא נמצאה עגינה"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"עליך לעגן את הטבלט לפני הגדרת אודיו ממעגן."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"עליך לעגן את הטלפון לפני הגדרת אודיו ממעגן."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"עליך לעגן את הטבלט לפני הגדרת אודיו ממעגן."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"עליך לעגן את הטלפון לפני הגדרת אודיו ממעגן."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"צליל כניסה למעגן"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"השמע צלילים בעת הכנסה של הטבלט לעגינה או הוצאתו ממנה"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"הפעל צליל בעת כניסת הטלפון לעגינה או יציאתו מעגינה"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"למחוק את כל המידע האישי שלך והיישומים שהורדת? לא ניתן לבטל את הפעולה!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"מחק הכל"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"שרטט את קו ביטול הנעילה"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"עליך לשרטט את קו ביטול הנעילה כדי לאפשר איפוס נתוני יצרן."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"עליך לשרטט את קו ביטול הנעילה כדי לאפשר איפוס נתוני יצרן."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"לא בוצע איפוס מכיוון שהשירות \'ניקוי מערכת\' אינו זמין."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"לאפס?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"מחק אחסון USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"למחוק את כרטיס ה-SD ואת כל הקבצים המאוחסנים בו? לא ניתן לבטל פעולה זו!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"מחק הכל"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"שרטט את קו ביטול הנעילה"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את אמצעי האחסון מסוג USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את כרטיס SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את אחסון ה-USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את כרטיס ה-SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"הגדרות שיחה"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"הגדרת דואר קולי, העברת שיחות, שיחה ממתינה, זיהוי מתקשר"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"קשירת USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"הבא"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"אבטחת הטבלט"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"אבטחת הטלפון"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. הסט את האצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר לפחות ארבע נקודות. "\n\n"מוכן להתחיל? גע באפשרות \'הבא\'."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. הסט את האצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר לפחות ארבע נקודות. "\n\n"מוכן להתחיל? גע ב\'הבא\'."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"הגן על הטלפון שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי במסך. השתמש באצבע כדי לחבר לפחות ארבע נקודות בכל סדר שהוא במסך הבא."\n\n"מוכן להתחיל? גע באפשרות \'הבא\'."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"נהל יישומים"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר יישומים מותקנים"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"מערכת"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"טקסט גדול"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"לחצן ההפעלה מסיים שיחה"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"אמירת סיסמאות"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"בדיקה דרך מגע"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"כאשר \'בדיקה דרך מגע\' מופעלת, ניתן לשמוע או לראות תיאורים של מה שנמצא מתחת לאצבע שלך."\n\n" תכונה זו נועדה למשתמשים לקויי ראייה."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"עיכוב של \'גע והחזק\'"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"אין שירותים מותקנים"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"זקוק לקורא מסך?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack מספק משוב מוקרא בקול רם כדי לעזור למשתמשים עיוורים ולקויי ראייה. האם ברצונך להתקין אותו ללא תשלום מ\'חנות Android\'?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"להתקין סקריפטים של אינטרנט?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"האם ברצונך שהיישומים יתקינו סקריפטים מ-Google שהופכים את תוכן האינטרנט שלהם לנגיש יותר?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"תכונה זו משנה את האופן שבו המכשיר מגיב למגע. להפעיל?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"לא סופק תיאור."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"אחסון האישורים נמחק."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"לא ניתן למחוק את האמצעי לאחסון אישורים."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"אחסון האישורים מופעל."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"עליך להגדיר את קוד PIN או סיסמה לנעילת המסך כדי שתוכל להשתמש באמצעי לאחסון אישורים."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"עליך להגדיר PIN או סיסמה לנעילת המסך כדי שתוכל להשתמש באחסון אישורים."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"צליל חירום"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"הגדר אופן פעולה בעת ביצוע שיחת חירום"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"גיבוי ואיפוס"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"מפתח משותף מראש של IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"אישור משתמש IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"אישור CA של IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"אישור של שרת IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"הצג אפשרויות מתקדמות"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"דומיינים של חיפוש DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"שרתי DNS (לדוגמה, 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"שמור את פרטי החשבון"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"לא בשימוש"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(אל תאמת שרת)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(התקבל מהשרת)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"בטל"</string>
     <string name="vpn_save" msgid="4233484051644764510">"שמור"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"התחבר"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"סיום"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"דלג על מערך השיעור"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"שיעור 1: היכרות עם המסך"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"לאחר הפעלת האפשרות \'חקור על ידי מגע\', תוכל לגעת במסך כדי לגלות מה נמצא בקצות אצבעותיך. לדוגמה, המסך הנוכחי מכיל סמלי יישומים. מצא אחד מהם על ידי נגיעה במסך והסטת האצבע מסביב."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"כאשר \'חקור על ידי מגע\' מופעל, אתה יכול לגעת במסך כדי לגלות מה נמצא מתחת לאצבע שלך. לדוגמה, המסך הנוכחי מכיל סמלי יישומים. מצא אחד מהם על ידי נגיעה במסך והסטה של האצבע על פני המסך."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"יפה מאוד, המשך להחליק את האצבע ברחבי המסך עד שתמצא לפחות סמל אחד נוסף."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"כדי להפעיל פריט שאתה נוגע בו, הקש עליו. הסט את האצבע עד שתמצא את הסמל של <xliff:g id="APP_NAME">%s</xliff:g>. לאחר מכן, הקש על הסמל פעם אחת כדי להפעילו."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"האצבע שלך נוגעת בסמל של <xliff:g id="APP_NAME">%s</xliff:g>. הקש פעם אחת כדי להפעיל את הסמל."</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 2b23122..56489b0 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"リムーバブルSDカード"</item>
     <item msgid="4498124044785815005">"システムで判断する"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"OFF"</item>
-    <item msgid="4804571292609523335">"バイブレーション"</item>
-    <item msgid="595707141547423573">"ミュート"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"常に使用"</item>
+    <item msgid="6293147072807231256">"なし"</item>
+    <item msgid="1276641209451816572">"マナーモードがONのときのみ"</item>
+    <item msgid="8418930333779132418">"マナーモードがOFFのときのみ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7ef3394..b50e3e1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -186,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"入力したホスト名は無効です。"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"入力された除外リストの形式が正しくありません。除外するドメインをカンマ区切りリスト形式で入力してください。"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"[ポート]フィールドに入力してください。"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"ポートフィールドを入力してください。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"[ホスト]フィールドが空の場合は、[ポート]フィールドも空にしてください。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"入力したポートは無効です。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTPプロキシはブラウザで使用されていますが、他のアプリでは使用できません。"</string>
@@ -308,14 +308,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"電源を入れるたびに数値のPINまたはパスワードを入力してタブレットを復号化する必要がある"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"電源を入れるたびに数値のPINまたはパスワードを入力して端末を復号化する必要がある"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"暗号化されています"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"アカウント、設定、ダウンロード済みアプリとそのデータ、メディア、その他のファイルを暗号化できます。タブレットを暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。データを初期化してユーザーデータをすべて消去しない限り、タブレットの暗号化を解除することはできません。"\n\n"暗号化の処理には1時間以上かかります。暗号化を開始する前に充電し、暗号化が完了するまでタブレットを電源に接続しておく必要があります。暗号化処理を中断すると、データの一部またはすべてが失われます。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"アカウント、設定、ダウンロード済みアプリとそのデータ、メディア、その他のファイルを暗号化できます。端末を暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。データを初期化してユーザーデータをすべて消去しない限り、端末の暗号化を解除することはできません。"\n\n"暗号化の処理には1時間以上かかります。暗号化を開始する前に充電し、暗号化が完了するまで端末を電源に接続しておく必要があります。暗号化処理を中断すると、データの一部またはすべてが失われます。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、タブレットを出荷時設定にリセットしてすべてのデータを消去しなければなりません。"\n\n"暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。端末を一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、端末を出荷時設定にリセットしてすべてのデータを消去しなければなりません。"\n\n"暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"タブレットを暗号化"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"携帯端末を暗号化"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"充電してからもう一度お試しください。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"電源に接続してもう一度お試しください。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"画面ロックのPIN/パスワードがありません"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"暗号化を開始するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"暗号化を開始するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"暗号化の確認"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"タブレットを暗号化しますか？この操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中でタブレットが何度か再起動されます。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"端末を暗号化しますか？この操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中で端末が何度か再起動されます。"</string>
@@ -325,8 +325,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>秒後にやり直してください。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"パスワードを入力してください"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"暗号化できませんでした"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"暗号化処理が中断され完了できなかったため、タブレット上のデータにアクセスできなくなりました。"\n\n"タブレットの使用を再開するには、出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択することができます。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"暗号化処理が中断され完了できなかったため、携帯端末上のデータにアクセスできなくなりました。"\n\n"携帯端末の使用を再開するには、出荷時設定にリセットする必要があります。リセット後、携帯端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択することができます。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。"\n\n"タブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"暗号化処理が中断されて完了できなかったため端末上のデータにアクセスできなくなりました。"\n\n"端末の使用を再開するには出荷時設定にリセットする必要があります。リセット後、端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"画面ロックを選択"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"バックアップのロックの選択"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"画面のロック"</string>
@@ -350,9 +350,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"なし"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"スライド"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"フェイスアンロック"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"パターンで保護されています"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PINで保護されています"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"パスワードで保護されています"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"パターン"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"パスワード"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"画面ロックをOFFにする"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ロック解除パターンを削除"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ロック解除PINを削除"</string>
@@ -596,7 +596,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"サウンド効果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"着信音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"マナーモード時のバイブレーション"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"バイブレーションと着信音"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"バイブ"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"デフォルトの通知音"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"光を点滅させて通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"着信音"</string>
@@ -625,8 +625,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"端末が装着されていません"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"装着したホルダーを設定する"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"ホルダーが見つかりません"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"ホルダーの音声をセットアップするにはタブレットをホルダーに装着する必要があります。"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"ホルダーの音声をセットアップするには携帯端末をホルダーに装着する必要があります。"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ホルダーの音声を設定するにはタブレットをホルダーに装着する必要があります。"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ホルダーの音声を設定するには端末をホルダーに装着する必要があります。"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"ホルダー装着時の音"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"タブレットのホルダー脱着時に音を鳴らす"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"携帯のホルダー脱着時に音を鳴らす"</string>
@@ -825,7 +825,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"個人情報とダウンロードしたアプリをすべて削除しますか？この操作を元に戻すことはできません。"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"すべて消去"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ロック解除パターンを入力してください"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"データの初期化を確定するにはロック解除パターンを入力する必要があります。"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"データの初期化を確定するにはロック解除パターンを入力する必要があります。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"リセットしますか？"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USBストレージ内データを消去"</string>
@@ -840,8 +840,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SDカード内のデータを消去して、保存されているすべてのファイルを削除しますか？この操作は元に戻せません。"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"すべて消去"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ロック解除パターンを入力してください"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USBストレージ内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SDカード内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USBストレージ内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SDカード内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ボイスメール、着信転送、発信者番号など"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBテザリング"</string>
@@ -938,7 +938,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"次へ"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"タブレットの保護"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"携帯端末の保護"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って、4つ以上の点を好きな順序で結んでください。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"秘密の画面ロック解除パターンを作成して端末を不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"アプリを管理"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"インストール済みアプリを管理、削除する"</string>
@@ -1160,7 +1160,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"システム"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"大きい文字サイズ"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"電源ボタンで通話を終了"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"パスワードの音声出力"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"タッチガイド"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"タッチガイドをONにすると、指で触れているアイテムについて説明を聞くか見ることができます。"\n\n"この機能は低視力のユーザー向けです。"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"押し続ける時間"</string>
@@ -1181,7 +1180,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"インストールされているサービスはありません"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"スクリーンリーダーをご利用になりますか？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkbackは音声で応答するアプリで、目の不自由なユーザーや低視力のユーザーを支援します。Androidマーケットから無料でインストールできます。"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"ウェブスクリプトをインストールしますか？"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"アプリからウェブコンテンツへのアクセスを容易にするためのスクリプトをGoogleからインストールしてもよろしいですか？"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"この機能を有効にすると、タップに対するデバイスの反応が変更されます。有効にしますか？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"説明はありません。"</string>
@@ -1330,7 +1328,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"認証情報ストレージを消去"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"認証情報ストレージを消去不可"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"認証情報ストレージが有効になりました。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"認証情報ストレージを使用する前に、ロック解除PINまたはパスワードを設定する必要があります。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"認証情報ストレージを使用するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"バックアップとリセット"</string>
@@ -1527,7 +1525,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec事前共有鍵"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSecユーザー証明書"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA証明書"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSecサーバー証明書"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"詳細オプションを表示する"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS検索ドメイン"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNSサーバー（例: 8.8.8.8）"</string>
@@ -1537,7 +1534,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"アカウント情報を保存する"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"（未使用）"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"（サーバーを確認しない）"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"（サーバーから受信）"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"キャンセル"</string>
     <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"接続"</string>
@@ -1561,7 +1557,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"終了"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"チュートリアルをスキップ"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"レッスン1:画面の各部について知る"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"タッチガイドをONにしておくと、画面に触れたときに指の場所に何があるかを知ることができます。たとえば現在の画面には各種アプリのアイコンがあります。画面に触れたまま指をあちこちにスライドさせて、アイコンを探してみてください。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"タッチガイドをONにしておくと、画面に触れたときに指の場所に何があるかを知ることができます。たとえば現在の画面には各種アプリのアイコンがあります。画面に触れたまま指をあちこちにスライドさせて、アイコンを探してみてください。"</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"OKです。指を画面のあちこちにスライドさせて、アイテムを少なくともあと1つ探してみてください。"</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"指で触れたアイテムを有効にするにはタップします。指をスライドさせて<xliff:g id="APP_NAME">%s</xliff:g>のアイコンを見つけたら、1回タップして有効にしてください。"</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"<xliff:g id="APP_NAME">%s</xliff:g>アイコンに指が触れています。アイコンを有効にするには1回タップしてください。"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 87eee7b..da1b14b 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"이동식 SD 카드"</item>
     <item msgid="4498124044785815005">"시스템에서 결정"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"사용 안함"</item>
-    <item msgid="4804571292609523335">"진동"</item>
-    <item msgid="595707141547423573">"음소거"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"항상"</item>
+    <item msgid="6293147072807231256">"선택 안함"</item>
+    <item msgid="1276641209451816572">"무음 모드일 때만"</item>
+    <item msgid="8418930333779132418">"무음 모드가 아닐 때만"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 69025ce..1fa9aa2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"확인"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"입력한 호스트 이름이 잘못되었습니다."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"입력한 제외목록의 형식이 올바르지 않습니다. 제외된 도메인을 쉼표로 구분한 목록을 입력하시기 바랍니다."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"포트를 입력해야 합니다."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"포트 정보를 입력해야 합니다."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"호스트가 비어 있는 경우 포트를 입력할 수 없습니다."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"입력한 포트가 올바르지 않습니다."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP 프록시는 브라우저에서 사용되며 다른 앱에서는 사용되지 않을 수 있습니다."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"태블릿의 전원을 켤 때마다 암호 해독을 위해 숫자 PIN 또는 비밀번호 입력"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"휴대전화의 전원을 켤 때마다 휴대전화의 암호를 해독하기 위해 숫자 PIN 또는 비밀번호가 필요합니다."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"암호화됨"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"계정, 설정, 다운로드한 앱과 해당 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력해야 합니다. 태블릿 암호화를 취소하려면 초기화를 수행해야 하며 이 때 데이터는 모두 지워집니다."\n\n"암호화에는 한 시간 이상이 걸립니다. 배터리가 충전되었을 때 시작해야 하며 암호화가 완료될 때까지 전원을 연결해야 합니다. 암호화 도중 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"계정, 설정, 다운로드한 앱과 해당 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력해야 합니다. 암호화를 취소하려면 초기화를 수행해야 하며 이 때 데이터는 모두 지워집니다."\n\n"암호화에는 한 시간 이상이 걸립니다. 배터리가 충전되었을 때 시작해야 하며 암호화가 완료될 때까지 전원을 연결해야 합니다. 암호화 도중 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 태블릿 암호화를 해제할 수 있습니다."\n\n"암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 휴대전화 암호화를 해제할 수 있습니다."\n\n"암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 휴대전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"태블릿 암호화"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"휴대전화 암호화"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"배터리를 충전한 다음 다시 시도하세요."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"충전기를 연결한 다음 다시 시도하세요."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"화면 잠금 PIN 또는 비밀번호 없음"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"암호화를 시작하기 전에 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"암호화를 시작하기 전에 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"암호화 확인"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"태블릿 암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 태블릿은 몇 번 다시 시작됩니다."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"휴대전화 암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 휴대전화는 몇 번 다시 시작됩니다."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>초 후에 다시 시도하세요."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"비밀번호 입력"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"암호화하지 못했습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. "\n\n" 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. "\n\n"휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. "\n\n" 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. "\n\n"휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"화면 잠금 선택"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"백업 잠금 선택"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"화면 잠금"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"없음"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"슬라이드"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"얼굴인식 잠금해제"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"패턴으로 보안"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN으로 보안"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"비밀번호로 보안"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"패턴"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"비밀번호"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"화면 잠금 사용 안함"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"잠금해제 패턴 삭제"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"잠금해제 PIN 삭제"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"음악 효과"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"모드 설정"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"무음 시 진동"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"진동 및 벨소리"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"진동"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"기본 알림"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"알림등 반복 표시"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"벨소리"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"도킹되지 않은 휴대전화"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"연결된 도크 설정"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"도크를 찾을 수 없음"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"태블릿을 도킹해야 오디오 도크를 설정할 수 있습니다."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"휴대전화를 도킹해야 오디오 도크를 설정할 수 있습니다."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"태블릿을 도킹해야 오디오 도크를 설정할 수 있습니다."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"휴대전화를 도킹해야 오디오 도크를 설정할 수 있습니다."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"도크 삽입음"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"도크에 태블릿을 끼우거나 제거할 때 소리 재생"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"도크에 휴대전화를 끼우거나 제거할 때 소리 재생"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"모든 개인 정보와 다운로드한 앱을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"잠금해제 패턴을 그리세요."</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"공장 초기화를 실행하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"초기화를 실행하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"시스템 지우기 서비스를 사용할 수 없어 초기화하지 못했습니다."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"재설정하시겠습니까?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB 저장소 지우기"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD 카드를 지워서 저장된 모든 파일을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"모두 지우기"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"잠금해제 패턴을 그리세요."</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USB 저장소를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SD 카드를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB 저장소를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD 카드를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"통화 설정"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 테더링"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"다음"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"태블릿 보안 설정"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"휴대전화 보안 설정"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 휴대전화를 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 최소한 4개의 점을 연결하세요. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"앱 관리"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"설치된 앱 관리 및 제거"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"시스템"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"텍스트 확대"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"전원 버튼으로 통화 종료"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"비밀번호 말하기"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"터치하여 탐색"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"터치하여 탐색 기능을 사용하면 손가락 아래에 표시된 항목에 대한 설명을 듣거나 볼 수 있습니다."\n\n"이 기능은 시각 장애인을 위한 것입니다."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"길게 누르기 지연"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"설치된 서비스가 없습니다."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"스크린 리더가 필요하십니까?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack은 시각 장애인을 위한 음성 피드백을 제공합니다. Android 마켓에서 무료로 설치하시겠습니까?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"웹 스크립트를 설치하시겠습니까?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"앱에 Google에서 제공하는 스크립트를 설치하도록 허용하시겠습니까? 설치하면 웹 콘텐츠에 더 쉽게 액세스할 수 있습니다."</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"이 기능을 사용하면 기기가 터치에 반응하는 방식이 바뀝니다. 사용하시겠습니까?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"제공된 설명이 없습니다."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"자격증명 저장소가 삭제되었습니다."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"자격증명 저장소를 삭제하지 못했습니다."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"자격증명 저장소를 사용합니다."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"자격증명 저장소를 사용하려면 먼저 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"자격증명 저장소를 사용하려면 먼저 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"백업 및 초기화"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec 사전 공유 키"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec 사용자 인증서"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA 인증서"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec 서버 인증서"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"고급 옵션 표시"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS 검색 도메인"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS 서버(예: 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"계정 정보 저장"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(사용되지 않음}"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(서버를 인증하지 않음)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(서버에서 수신)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"취소"</string>
     <string name="vpn_save" msgid="4233484051644764510">"저장"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"연결"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"완료"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"안내서 건너뛰기"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"강의 1: 화면 탐색"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"\'터치하여 탐색\'을 사용하면 화면을 터치하여 손가락으로 터치하는 항목이 무엇인지 알 수 있습니다. 예를 들어, 현재 화면에 앱 아이콘이 있습니다. 화면을 터치하고 손가락을 움직여 앱을 찾아 보세요."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"터치하여 탐색 기능을 사용하면 화면을 터치하여 손가락 아래에 표시된 항목이 무엇인지 알 수 있습니다. 예를 들어, 현재 화면에 앱 아이콘이 있습니다. 화면을 터치하고 손가락을 움직여 앱을 찾아 보세요."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"최소 하나 이상의 아이콘을 찾을 때까지 화면을 손가락으로 계속 슬라이드합니다."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"터치하고 있는 항목을 활성화하려면 해당 항목을 탭합니다. <xliff:g id="APP_NAME">%s</xliff:g> 아이콘을 찾을 때까지 손가락을 슬라이드합니다. 그런 다음 아이콘을 한 번 탭하여 활성화합니다."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"손가락으로 <xliff:g id="APP_NAME">%s</xliff:g> 아이콘을 터치하고 있습니다. 아이콘을 활성화하려면 한 번 탭하세요."</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index fada382..e4443f6 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Keičiama SD kortelė"</item>
     <item msgid="4498124044785815005">"Leisti nuspręsti sistemai"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Išjungta"</item>
-    <item msgid="4804571292609523335">"Vibruoti"</item>
-    <item msgid="595707141547423573">"Nutildyti"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Visada"</item>
+    <item msgid="6293147072807231256">"Niekada"</item>
+    <item msgid="1276641209451816572">"Tik tyliu režimu"</item>
+    <item msgid="8418930333779132418">"Tik kai veikia ne tyliu režimu"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4bd9981..dd71d25 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Gerai"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Įvestas prieglobos serverio pavadinimas netinkamas."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Įvestas išimčių sąrašas netinkamai suformatuotas. Įveskite kableliais atskirtą išskirtų domenų sąrašą."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Turite užpildyti prievado lauką."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Turite užpildyti prievado lauką."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Prievado laukas turi būti tuščias, jei tuščias prieglobos laukas."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Prievadas, kurį įvedėte, netinkamas."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti planšetinį kompiuterį kaskart jį įjungus"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti telefoną kaskart jį įjungus"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifruotas"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją bei kitus failus. Kai užšifruosite planšetinį kompiuterį, turėsite įvesti skaitinį PIN kodą ar slaptažodį, kad iššifruotumėte jį kaskart įjungę: panaikinti planšetinio kompiuterio šifravimą galima tik iš naujo nustačius gamyklinius duomenis ištrinant visus duomenis."\n\n"Šifravimas trunka valandą ar ilgiau. Pradėti šifravimą reikia įkrovus akumuliatorių ir iki šifravimo pabaigos laikant planšetinį kompiuterį įjungtą į lizdą. Jei nutrauksite šifravimą, prarasite visus duomenis ar jų dalį."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją bei kitus failus. Kai užšifruosite telefoną, turėsite įvesti skaitinį PIN kodą ar slaptažodį, kad iššifruotumėte jį kaskart įjungę: panaikinti telefono šifravimą galima tik iš naujo nustačius gamyklinius duomenis ištrinant visus duomenis."\n\n"Šifravimas trunka valandą ar ilgiau. Pradėti šifravimą reikia įkrovus akumuliatorių ir iki šifravimo pabaigos laikant telefoną įjungtą į lizdą. Jei nutrauksite šifravimą, prarasite visus duomenis ar jų dalį."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir su jomis susijusius duomenis, medijos ir kitus failus. Užšifravę planšetinį kompiuterį turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę: planšetinio kompiuterio neužšifruoti negalite, išskyrus atvejus, kai iš naujo nustatote gamyklinius duomenis, ištrindami visus turimus duomenis."\n\n"Šifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir prijungti planšetinį kompiuterį prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir su jomis susijusius duomenis, medijos ir kitus failus. Užšifravę planšetinį kompiuterį turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę: planšetinio kompiuterio neužšifruoti negalite, išskyrus atvejus, kai iš naujo nustatote gamyklinius duomenis, ištrindami visus turimus duomenis."\n\n"Šifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir prijungti planšetinį kompiuterį prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifruoti planšetinį kompiuterį"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifruoti telefoną"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Įkraukite akumuliatorių ir bandykite dar kartą."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Įjunkite kroviklį į lizdą ir bandykite dar kartą."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nėra ekrano užrakto PIN kodo ar slaptažodžio"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Prieš pradedant šifravimą, reikia nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Prieš pradėdami šifravimo procesą turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Patvirtinti šifravimą"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Šifruoti planšetinį kompiuterį? Šios operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant planšetinis kompiuteris kelis kartus bus paleidžiamas iš naujo."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Šifruoti telefoną? Šios operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant telefonas kelis kartus bus paleidžiamas iš naujo."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Bandyti dar kartą po <xliff:g id="DELAY">^1</xliff:g> sek."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Įveskite slaptažodį"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifruotė nepavyko"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Šifravimas buvo pertrauktas ir nepavyko jo užbaigti. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. "\n\n" Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifravimas buvo pertrauktas ir nepavyko jo užbaigti. Todėl duomenys telefone nebepasiekiami. "\n\n"Jei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. "\n\n" Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys telefone nebepasiekiami. "\n\n"Jei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Pasir. ekrano užraktą"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pasirinkti atsarginį užrakinimą"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrano užraktas"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nėra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slinkti"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Atrakinimas pagal veidą"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Apsaugota taikant modelį"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Apsaugota taikant PIN kodą"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Apsaugota taikant slaptažodį"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Šablonas"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kodas"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Slaptažodis"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Išjungti ekrano užraktą"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Pašalinti atrakinimo modelį"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Pašalinti atrakinimo PIN kodą"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Muzikos efektai"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Skambučio garsumas"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibruoti, kai veikia tyliuoju režimu"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibruoti ir skambėti"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibruoti"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Numatytasis pranešimas"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsuojanti įspėjimo šviesa"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Skambėjimo tonas"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonas neprijungtas"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Pridėtos piktogramų juostos nustatymai"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dokas nerastas"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Prieš nustatydami doko garsą, turite įtraukti planšetinį kompiuterį į doką."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Prieš nustatydami doko garsą, turite įtraukti telefoną į doką."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Prieš nustatydami prijungimo garso įrašą turėsite prijungti planšetinį kompiuterį."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Prieš nustatydami prijungimo garso įrašą turėsite prijungti telefoną."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Doko įstatymo garsas"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Paleisti garsą įdedant planšetinį kompiuterį į doką ar jį pašalinant"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Paleisti garsą, kai telefonas įdedamas ar pašalinamas iš dėklo"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo negalėsite atšaukti!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ištrinti viską"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Nustatyti atrakinimo modelį"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Kad patvirtintumėte gamyklinių duomenų nustatymą iš naujo, turite nubrėžti atrakinimo šabloną."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Kad patvirtintumėte gamyklinių duomenų nustatymą iš naujo, turite nubrėžti atrakinimo šabloną."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nebuvo nustatyta iš naujo, nes paslauga „Sistemos išvalymas“ nepasiekiama."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Nustatyti iš naujo?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ištrinti USB atmintinę"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ištrinti SD kortelę ištrinant visus joje saugomus failus? Šio veiksmo negalėsite atšaukti!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ištrinti viską"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Nustatyti atrakinimo modelį"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Kad patvirtintumėte, jog norite ištrinti USB atmintinę, turite nubrėžti atrakinimo šabloną."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Kad patvirtintumėte, jog norite ištrinti SD kortelę, turite nubrėžti atrakinimo šabloną."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Kad patvirtintumėte, jog norite ištrinti USB atmintinę, turite nubrėžti atrakinimo šabloną."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kad patvirtintumėte, jog norite ištrinti SD kortelę, turite nubrėžti atrakinimo šabloną."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Skambinimo nustatymai"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nustatyti balso paštą, skambučio peradresavimą, skambučio laukimą, skambintojo ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB susiejimas"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Kitas"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Planšetinio kompiuterio saugumo užtikrinimas"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Telefono apsaugojimas"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Apsaugokite planšetinį kompiuterį nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo modelį. Pirštu bet kokia tvarka sujunkite taškus kitame ekrane. Reikia sujungti bent keturis taškus. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Apsaugokite planšetinį kompiuterį nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo šabloną. Pirštu bet kokia tvarka sujunkite taškus kitame ekrane. Reikia sujungti bent keturis taškus. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Apsaugokite telefoną nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo modelį. Pirštu bet kokia tvarka sujunkite mažiausiai keturis taškus kitame ekrane. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Valdyti programas"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Tvarkykite ir pašalinkite įdiegtas programas"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Didelis tekstas"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Maitinimo mygtukas baigia skambutį"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Sakyti slaptažodžius"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Naršyti paliečiant"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kai įjungta naršymo paliečiant funkcija, galite girdėti elemento, ant kurio yra jūsų pirštas, aprašą."\n\n" Ši funkcija skirta trumparegiams naudotojams."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"„Paliesti ir laikyti“ delsa"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nėra įdiegta jokių paslaugų"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Reikia ekrano skaitytuvo?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"„TalkBack“ teikia atsiliepimus žodžiu, kad padėtų akliems ir sutrikusio regėjimo naudotojams. Ar norite nemokamai įdiegti šią funkciją iš „Android“ prekyvietės?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Įdiegti žiniatinklio scenarijus?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ar norite programose įdiegti scenarijus iš „Google“, kurie padarytų jų turinį geriau pasiekiamą?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Įjungus šią funkciją, pasikeis įrenginio reakcija į palietimą. Įjungti?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nepateikta jokių aprašų."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Įgaliojimų atmintinė ištrinta."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Nepavyko ištr. kreden. atmint."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Įgaliojimų saugykla įgalinta."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Jei norite naudoti kredencialų atmintinę, pirmiausia turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Jei norite naudoti kredencialų atmintinę, pirmiausia turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Pagalbos tonas"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nustatyti elgesį, kai skambinama pagalbos numeriu"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Kurti atsarginę kopiją ir nustatyti iš naujo"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"„IPSec“ iš anksto bendrinamas raktas"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"„IPSec“ naudotojo sertifikatas"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"„IPSec“ CA sertifikatas"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"„IPSec“ serverio sertifikatas"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Rodyti išplėstines parinktis"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS paieškos domenai"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS serveriai (pvz., 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Išsaugoti paskyros informaciją"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(nenaudojama)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(nepatvirtinti serverio)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(gauta iš serverio)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Atšaukti"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Išsaugoti"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Prisijungti"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Užbaigti"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Pral. mok. pr."</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1 pamoka: ekrano tyrinėjimas"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Kai įjungsite funkciją „Naršyti liečiant“, palietę ekraną sužinosite, kas yra po jūsų pirštu. Pvz., dabartiniame ekrane yra programų piktogramų. Raskite vieną iš jų palietę ekraną ir slinkdami juo pirštu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Kai įjungta funkcija „Tyrinėti liečiant“, palietę ekraną sužinosite, kas yra po jūsų pirštu. Pvz., dabartiniame ekrane yra programų piktogramų. Raskite vieną iš jų palietę ekraną ir slysdami juo pirštu."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Gerai. Palieskite pirštu ekraną ir slinkite juo, kad surastumėte bent dar vieną piktogramą."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Jei norite suaktyvinti tai, ką liečiate, palieskite tai. Slinkite pirštu, kol rasite „<xliff:g id="APP_NAME">%s</xliff:g>“ piktogramą. Tada vieną kartą palieskite piktogramą, kad ją suaktyvintumėte."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Pirštu liečiate piktogramą <xliff:g id="APP_NAME">%s</xliff:g>. Palieskite vieną kartą, kad suaktyvintumėte piktogramą."</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 805a8c6..11d302f 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -27,7 +27,7 @@
     <item msgid="4439789052790868249">"Āzija"</item>
     <item msgid="956915953069815961">"Austrālija"</item>
     <item msgid="5345178126174698955">"Klusais okeāns"</item>
-    <item msgid="8392017019801393511">"Visas"</item>
+    <item msgid="8392017019801393511">"Visus"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekundes"</item>
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Izņemama SD karte"</item>
     <item msgid="4498124044785815005">"Ļaut sistēmai izlemt"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Izslēgts"</item>
-    <item msgid="4804571292609523335">"Vibrozvans"</item>
-    <item msgid="595707141547423573">"Izslēgt skaņu"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Vienmēr"</item>
+    <item msgid="6293147072807231256">"Nekad"</item>
+    <item msgid="1276641209451816572">"Tikai klusuma režīmā"</item>
+    <item msgid="8418930333779132418">"Tikai, kad nav aktīvs Klusuma režīms"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 700def2..2bd2fa7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Labi"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Ierakstītais saimniekdatora nosaukums nav derīgs."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Ierakstītais izslēgšanas saraksts nav pareizi formatēts. Ierakstiet ar komatiem atdalītu izslēgto domēnu sarakstu."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Aizpildiet porta lauku."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Aizpildiet lauku Ports."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ja saimniekdatora lauks ir tukšs, porta laukam jābūt tukšam."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Ierakstītais porta numurs nav derīgs."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP starpniekserveris tiek izmantots pārlūkprogrammā, taču, iespējams, netiek izmantots citās lietotnēs."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ieslēdzot planšetdatoru, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ieslēdzot tālruni, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrēts"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietotnes un ar tām saistītos datus, multivides failus un citus failus. Ja planšetdators ir šifrēts, ikreiz, kad to ieslēdzat, ir jāveic atšifrēšana, ievadot ciparu PIN kodu vai paroli. Planšetdatora šifrējumu var noņemt, tikai atiestatot rūpnīcas datus un dzēšot visus ierīces datus."\n\n"Šifrēšana ilgst vienu stundu vai ilgāk. Pirms šifrēšanas ir jāuzlādē akumulators un planšetdators ir jāpievieno barošanas avotam līdz brīdim, kad šifrēšana ir pabeigta. Pārtraucot šifrēšanas procesu, tiks zaudēti visi dati vai daļa no tiem."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietotnes un ar tām saistītos datus, multivides failus un citus failus. Ja tālrunis ir šifrēts, ikreiz, kad to ieslēdzat, ir jāveic atšifrēšana, ievadot ciparu PIN kodu vai paroli. Tālruņa šifrējumu var noņemt, tikai atiestatot rūpnīcas datus un dzēšot visus ierīces datus."\n\n"Šifrēšana ilgst vienu stundu vai ilgāk. Pirms šifrēšanas ir jāuzlādē tālruņa akumulators, un tālrunis ir jāpievieno barošanas avotam līdz brīdim, kad šifrēšana ir pabeigta. Pārtraucot šifrēšanas procesu, tiks zaudēti visi dati vai to daļa."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet planšetdatoru, katru reizi ieslēdzot planšetdatoru, būs jāievada ciparu PIN vai parole, lai datoru atšifrētu. Planšetdatora šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati."\n\n"Atšifrēšana ilgst stundu vai vairāk. Akumulatoram ir jābūt pilnībā uzlādētam un datoram jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet tālruni, katru reizi to ieslēdzot, būs jāievada ciparu PIN vai parole, lai tālruni atšifrētu. Tālruņa šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati."\n\n"Atšifrēšana ilgst stundu vai vairāk. Akumulatoram ir jābūt pilnībā uzlādētam un tālrunim ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrēt planšetdatoru"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrēt tālruni"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Uzlādējiet akumulatoru un mēģiniet vēlreiz."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pievienojiet lādētāju un mēģiniet vēlreiz."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nav ekrāna bloķēšanas PIN vai paroles"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Lai sāktu šifrēšanu, ir jāiestata ekrāna bloķēšanas PIN kods vai parole."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Lai varētu sākt šifrēšanu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Šifrēšanas apstiprinājums"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vai šifrēt planšetdatoru? Šī darbība nav atgriezeniska; to pārtraucot, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, tās laikā planšetdators vairākas reizes tiks restartēts."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vai šifrēt tālruni? Šī darbība nav atgriezeniska; to pārtraucot, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, tās laikā tālrunis vairākas reizes tiks restartēts."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Mēģiniet vēlreiz pēc <xliff:g id="DELAY">^1</xliff:g> sekundēm."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ierakstiet paroli"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrēšana neizdevās."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tādējādi planšetdatora dati vairs nav pieejami."\n\n"Lai atsāktu lietot planšetdatoru, ir jāveic atiestatīšana uz rūpnīcas iestatījumiem. Kad esat veicis atiestatīšanu, varat atjaunot jebkādus datus, kas tika dublēti jūsu Google kontā."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tādējādi tālruņa dati vairs nav pieejami."\n\n"Lai atsāktu lietot tālruni, ir jāveic atiestatīšana uz rūpnīcas iestatījumiem. Kad esat veicis atiestatīšanu, varat atjaunot jebkādus datus, kas tika dublēti jūsu Google kontā."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Planšetdatora dati vairs nav pieejami."\n\n"Lai atsāktu lietot planšetdatoru, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis planšetdatora iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tālruņa dati vairs nav pieejami."\n\n"Lai atsāktu lietot tālruni, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis tālruņa iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Ekrāna bloķēš. atlase"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Rezerves bloķ. izvēle"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrāna bloķēšana"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nav"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Vilkt ar pirkstu"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Autorizācija pēc sejas"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Aizsargāts ar kombināciju"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Aizsargāts ar PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Aizsargāts ar paroli"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Shēma"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parole"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Izslēgt ekrāna bloķēšanu"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Noņemt atbloķēšanas kombināciju"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Noņemt atbloķēšanas PIN"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Mūzikas efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zvanītāja skaļums"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrē klusuma režīmā"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrozvans un zvans"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrē"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Noklusējuma paziņojums"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsa paziņojuma indikators"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvana signāls"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Tālrunis nav dokots"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Pievienotā doka iestatījumi"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Doks nav atrasts"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Pirms doka audio iestatīšanas planšetdators ir jāpievieno dokam."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Pirms doka audio iestatīšanas tālrunis ir jāpievieno dokam."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Pirms dokošanas skaņas iestatīšanas veiciet planšetdatora dokošanu."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Pirms dokošanas skaņas iestatīšanas veiciet tālruņa dokošanu."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dokā ievietošanas skaņa"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Atskaņot skaņu, ievietojot planšetdatoru dokā vai noņemot to no doka"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Atskaņot skaņu, kad tālrunis tiek ievietots dokā vai tiek izņemts no tā"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vai dzēst visu jūsu personīgo informāciju un visas lejupielādētās lietotnes? Šo darbību nevar atcelt!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Dzēst visu"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Zīmējiet atbloķēšanas kombināciju."</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Ir jāuzzīmē atbloķēšanas shēma, lai apstiprinātu rūpnīcas datu atiestatīšanu."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Lai apstiprinātu rūpnīcas datu atiestatīšanu, norādiet grafisko atslēgu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Atiestatīšana netika veikta, jo nav pieejams pakalpojums Sistēmas tīrīšana."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vai atiestatīt?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Dzēst USB krātuvi"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vai izdzēst SD kartes saturu, tostarp visus tajā saglabātos failus? Šo darbību nevar atcelt!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Dzēst visu"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Zīmējiet atbloķēšanas kombināciju."</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Ir jāuzzīmē atbloķēšanas shēma, lai apstiprinātu, ka vēlaties dzēst USB krātuvi."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Ir jāuzzīmē atbloķēšanas shēma, lai apstiprinātu, ka vēlaties dzēst SD karti."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Lai apstiprinātu USB atmiņas satura dzēšanu, norādiet grafisko atslēgu."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Lai apstiprinātu SD kartes satura dzēšanu, norādiet grafisko atslēgu."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Zvanu iestatījumi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Balss pasta, zvanu pāradresācijas, zvana gaidīšanas, zvanītāja ID iestatīšana"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB saistīšana"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Tālāk"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Planšetdatora drošība"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Tālruņa nodrošināšana"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Aizsargājiet savu planšetdatoru pret neatļautu lietošanu, izveidojot personalizētu ekrāna atbloķēšanas rakstu. Velkot ar pirkstu, jebkurā secībā savienojiet nākamajā ekrānā redzamos punktus. Ir jāsavieno vismaz četri punkti. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Aizsargājiet savu planšetdatoru pret neatļautu lietošanu, izveidojot personalizētu ekrāna grafisko atslēgu. Velkot ar pirkstu, jebkurā secībā savienojiet nākamajā ekrānā redzamos punktus. Ir jāsavieno vismaz četri punkti. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Aizsargājiet savu tālruni pret neatļautu lietošanu, izveidojot personalizētu ekrāna atbloķēšanas rakstu. Velkot ar pirkstu, jebkurā secībā savienojiet vismaz četrus no nākamajā ekrānā redzamajiem punktiem. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pārvaldīt lietotnes"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pārvaldiet un noņemiet instalētās lietotnes"</string>
@@ -984,7 +984,7 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Vietas pārvaldība"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrs"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izvēlēties filtra opcijas"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Visas"</string>
+    <string name="filter_apps_all" msgid="5142129378749391876">"Visus"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Lejupielādēts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Darbojas"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB krātuve"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistēma"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Liels teksts"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Beigt zv., nosp. baroš. pogu"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Paroļu izrunāšana"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Atklāt pieskaroties"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kad ir ieslēgta funkcija Atklāt pieskaroties, var dzirdēt vai redzēt tā vienuma aprakstu, virs kura atrodas pirksts."\n\n"Šī funkcija ir paredzēta vājredzīgajiem lietotājiem."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Aizkav., pieskar. un turot nosp."</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nav instalēts neviens pakalpojums."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vai jums ir nepieciešams ekrāna lasītājs?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Lietotne TalkBack par ekrānā notiekošo informē balss komentāru veidā, lai palīdzētu neredzīgiem un vājredzīgiem lietotājiem. Vai vēlaties to instalēt bez maksas no vietnes Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vai instalēt tīmekļa skriptus?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vai vēlaties, lai lietotnes instalētu skriptus no Google, kas padara to tīmekļa saturu pieejamāku?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Izmantojot šo funkciju, tiek mainīta ierīces reakcija uz skārienu. Vai ieslēgt?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Apraksts nav sniegts."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Akreditācijas datu krātuve ir izdzēsta."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Akred. datus nevarēja izdzēst"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Akreditācijas datu krātuve ir iespējota."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Lai varētu izmantot akreditācijas datu atmiņu, ir jāiestata ekrāna bloķēšanas PIN kods vai parole."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Lai varētu izmantot akreditācijas datu atmiņu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ārkārtas signāls"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Iestatīt uzvedību, kad tiek veikts ārkārtas zvans"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Dublēt un atiestatīt"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Protokola IPsec iepriekš kopīgotā atsl."</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Protokola IPsec lietotāja sertifikāts"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Protokola IPsec CA sertifikāts"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec servera sertifikāts"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Rādīt papildopcijas"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Sistēmas DNS meklēšanas domēni"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS serveri (piem., 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Saglabāt konta informāciju"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(netiek lietots)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(neverificēt serveri)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(saņemts no servera)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Atcelt"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Saglabāt"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Savienot"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Pabeigt"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Izl. māc."</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. nodarbība: ekrāna izpēte"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Kad ir ieslēgta iespēja Atklāt pieskaroties, varat pieskarties ekrānam, lai uzzinātu vairāk par vienumu, virs kura atrodas jūsu pirksts. Piemēram, pašreizējā ekrānā ir redzamas lietotņu ikonas. Atrodiet kādu no tām, pieskaroties ekrānam un velkot pa to ar pirkstu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Ja ir ieslēgta funkcija Atklāt pieskaroties, varat pieskarties ekrānam, lai uzzinātu vairāk par vienumu, virs kura atrodas jūsu pirksts. Piemēram, pašreizējā ekrānā ir redzamas lietotņu ikonas. Atrodiet kādu no tām, pieskaroties ekrānam un velkot pa to ar pirkstu."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Turpiniet vilkt ar pirkstu pa ekrānu, līdz atrodat vismaz vēl vienu ikonu."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Lai aktivizētu vienumu, pie kura atrodas jūsu pirksts, pieskarieties šim vienumam. Velciet ar pirkstu, līdz atrodat lietotnes <xliff:g id="APP_NAME">%s</xliff:g> ikonu. Pēc tam vienreiz pieskarieties ikonai, lai to aktivizētu."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jūsu pirksts ir virs lietotnes <xliff:g id="APP_NAME">%s</xliff:g> ikonas. Pieskarieties vienreiz, lai aktivizētu ikonu."</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 282b647..95d543c 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Kad SD boleh tanggal"</item>
     <item msgid="4498124044785815005">"Biar sistem menentukan"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Dimatikan"</item>
-    <item msgid="4804571292609523335">"Getar"</item>
-    <item msgid="595707141547423573">"Redam"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Sentiasa"</item>
+    <item msgid="6293147072807231256">"Jangan sekali-kali"</item>
+    <item msgid="1276641209451816572">"Dalam mod Senyap sahaja"</item>
+    <item msgid="8418930333779132418">"Apabila tidak berada dalam mod Senyap sahaja"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e36c320..5fea9bf 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Nama hos yang anda taipkan tidak sah."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Senarai pengecualian yang anda taipkan tidak diformatkan dengan betul. Taip senarai domain yang dikecualikan yang dipisahkan dengan koma."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Anda perlu melengkapkan medan port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Anda perlu melengkapkan medan port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Medan port haruslah kosong sekiranya medan hos kosong."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang anda taipkan tidak sah."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau kata laluan angka untuk menyahsulit tablet anda setiap kali anda menghidupkannya"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau kata laluan angka untuk menyahsulit telefon anda setiap kali dan menghidupkannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Disulitkan"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Anda boleh menyulitkan akaun anda, tetapan, aplikasi yang dimuat turun serta datanya, media dan fail lain. Apabila anda sudah menyulitkan tablet anda, anda mesti memasukkan PIN atau kata laluan angka untuk menyahsulitkannya setiap kali anda menghidupkannya: anda tidak boleh membuang penyulitan tablet anda kecuali dengan melaksanakan penetapan semula data kilang yang akan menghapuskan semua data anda."\n\n"Penyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang sudah dicas dan membiarkan tablet anda disambungkan kepada bekalan kuasa sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau kesemua data anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Anda boleh menyulitkan akaun anda, tetapan, aplikasi yang dimuat turun serta datanya, media dan fail lain. Apabila anda sudah menyulitkan telefon anda, anda mesti memasukkan PIN atau kata laluan angka untuk menyahsulitnya setiap kali anda menghidupkannya: anda tidak boleh membuang penyulitan telefon anda kecuali dengan melaksanakan penetapan semula data kilang yang akan memadamkan semua data anda."\n\n"Penyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang sudah dicas dan menyambungkan bekalan kuasa kepada telefon anda sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau kesemua data anda."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Anda boleh menyulitkan akaun anda, tetapan, aplikasi yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan tablet anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya: anda tidak boleh menyahsulit tablet anda kecuali dengan melakukan penetapan semula data kilang, yang memadamkan semua data anda."\n\n"Penyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan tablet anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Anda boleh menyulitkan akaun anda, tetapan, aplikasi yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan telefon anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya: anda tidak boleh menyahsulit telefon anda kecuali dengan melakukan tetapan semula data kilang, yang memadamkan semua data anda."\n\n"Penyulitan mengambil satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan telefon anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Sulitkan tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Sulitkan telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Cas bateri anda dan cuba lagi."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pasangkan palam pengecas anda dan cuba lagi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tiada PIN kunci skrin atau kata laluan"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Anda mesti menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh memulakan penyulitan."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Anda perlu menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh memulakan penyulitan."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Sahkan penyulitan"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Sulitkan tablet? Operasi ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih, dalam masa yang sama tablet akan dimulakan semula beberapa kali."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Sulitkan telefon? Operasi ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih, dalam masa yang sama telefon akan dimulakan semula beberapa kali."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Cuba lagi dalam <xliff:g id="DELAY">^1</xliff:g> saat."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Taipkan kata laluan anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Penyulitan tidak berjaya"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Hasilnya, data pada tablet anda tidak lagi boleh diakses. "\n\n" Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. "\n\n"Untuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada tablet anda tidak lagi boleh diakses. "\n\n" Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. "\n\n"Untuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Pilih kunci skrin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih kunci sandaran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kunci skrin"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tiada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slaid"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Buka Kunci Wajah"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Dilindungi dengan corak"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Dilindungi PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Dilindungi kata laluan"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Corak"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Kata laluan"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Matikan kunci skrin"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alih keluar corak buka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alih keluar PIN buka kunci"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Kesan muzik"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Kelantangan pendering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar apabila senyap"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Bergetar dan berdering"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Getar"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Pemberitahuan lalai"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Lampu pemberitahuan denyutan"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon tidak berada dalam dok"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Tetapan untuk dok yang dipasangkan"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok tidak ditemui"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Anda mesti dok tablet sebelum menyediakan audio dok."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Anda mesti dok telefon sebelum menyediakan audio dok."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Anda perlu dok tablet sebelum menyediakan audio dok."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Anda perlu dok telefon sebelum menyediakan audio dok."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Bunyi pemasukan dok"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Mainkan bunyi apabila memasukkan atau mengeluarkan tablet dari dok"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Mainkan bunyi apabila memasukkan atau mengeluarkan telefon dari dok"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Padamkan semua maklumat peribadi anda dan aplikasi yang dimuat turun? Anda tidak boleh menterbalikkan tindakan ini!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Padamkan semua"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Lukis corak buka kunci anda"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Anda mesti melukiskan corak buka kunci anda untuk mengesahkan tetapan semula data kilang."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan tetapan semula data kilang."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Tetapkan semula?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Padam storan USB"</string>
@@ -838,15 +838,15 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Padamkan kad SD, turut memadamkan semua fail yang tersimpan padanya? Anda tidak boleh menterbalikkan tindakan ini!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Padamkan semua"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Lukis corak buka kunci anda"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Anda mesti melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan storan USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Anda mesti melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan kad SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan storan USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan kad SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Tetapan panggilan"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Tetapkan mel suara, pemajuan panggilan, panggilan menunggu, ID pemanggil"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Titik panas mudah alih"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Penambatan"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Liputan t\'batan &amp; m\'alih"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841"></string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB disambungkan, semak untuk menambat"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Seterusnya"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Melindungi tablet anda"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Melindungi telefon anda"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Lindungi tablet anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Gelongsorkan jari anda untuk menyambungkan titik dalam sebarang tertib pada skrin berikutnya. Anda mesti menyambungkan sekurang-kurangnya empat titik. "\n\n"Sedia untuk bermula? Sentuh Seterusnya."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Lindungi tablet anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Luncurkan jari anda untuk menyambungkan titik dalam sebarang tertib pada skrin berikutnya. Anda mesti menyambungkan sekurang-kurangnya empat titik."\n\n"Sedia untuk bermula? Sentuh Seterusnya."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Lindungi telefon anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Luncurkan jari anda untuk menyambungkan sekurang-kurangnya empat titik dalam sebarang tertib pada skrin seterusnya. "\n\n"Sedia untuk bermula? Sentuh Seterusnya."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Urus aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Urus dan alih keluar aplikasi yang dipasang"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Teks besar"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Butang kuasa menamatkan panggilan"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Tuturkan kata laluan"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Jelajah dengan sentuhan"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Apabila Jelajah dengan Sentuhan dihidupkan, anda boleh mendengar atau melihat huraian item di bawah jari anda."\n\n" Ciri ini adalah untuk pengguna kurang penglihatan."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Lengah sentuh &amp; tahan"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tiada perkhidmatan dipasang"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlukan pembaca skrin?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan maklum balas bersuara untuk membantu pengguna yang buta dan berpenglihatan kabur. Adakah anda ingin memasangnya secara percuma dari Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Pasang skrip web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Adakah anda mahu aplikasi memasang skrip daripada Google yang menjadikan kandungan laman web mereka lebih mudah diakses?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ciri ini mengubah cara peranti anda bertindak balas kepada sentuhan. Hidupkan?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tiada keterangan disediakan."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Storan bukti kelayakan dipadamkan."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Storan bukti kelayakan tidak boleh dipadamkan."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Storan bukti klykn didayakan."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Anda mesti menetapkan kunci skrin PIN atau kata laluan sebelum anda boleh menggunakan storan bukti kelayakan."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menetapkan PIN kunci skrin atau kata laluan sebelum anda boleh menggunakan storan bukti kelayakan."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada kecemasan"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Tetapkan tingkah laku semasa membuat panggilan kecemasan"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Penyandaran &amp; penetapan semula"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Kunci prakongsi IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Sijil pengguna IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Sijil CA IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Sijil pelayan IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Tunjukkan pilihan terperinci"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domain carian DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Pelayan DNS (mis. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Simpan maklumat akaun"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(tidak digunakan)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(jangan sahkan pelayan)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(diterima daripada pelayan)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Batal"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Simpan"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Sambung"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Selesai"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Lgkau ttrl"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Pelajaran 1: Menjelajah skrin"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Selepas anda menghidupkan Teroka melalui Sentuhan, anda boleh menyentuh skrin untuk mengetahui apa di hujung jari anda. Sebagai contoh, skrin semasa mengandungi ikon aplikasi. Cari salah satu daripadanya dengan menyentuh skrin dan meluncurkan jari anda ke sekeliling skrin."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Apabila Teroka melalui Sentuhan dihidupkan, anda boleh sentuh skrin untuk mengetahui apa di hujung jari anda. Sebagai contoh, skrin semasa mengandungi ikon aplikasi. Cari salah satu daripadanya dengan menyentuh skrin dan melungsurkan jari anda ke sekeliling skrin."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bagus. Teruskan meluncurkan jari anda di sekitar skrin sehingga anda menemui sekurang-kurangnya satu lagi ikon."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Untuk mengaktifkan sesuatu yang anda sentuh, ketikkannya. Luncurkan jari anda sehingga anda menemui ikon untuk <xliff:g id="APP_NAME">%s</xliff:g>. Kemudian ketik sekali pada ikon itu untuk mengaktifkannya."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jari anda menyentuh ikon <xliff:g id="APP_NAME">%s</xliff:g>. Ketik sekali untuk mengaktifkan ikon."</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index f9bf923..4e18810 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Flyttbart minnekort"</item>
     <item msgid="4498124044785815005">"La systemet bestemme"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Av"</item>
-    <item msgid="4804571292609523335">"Vibrer"</item>
-    <item msgid="595707141547423573">"Kutt lyd"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Alltid"</item>
+    <item msgid="6293147072807231256">"Aldri"</item>
+    <item msgid="1276641209451816572">"Kun i stillemodus"</item>
+    <item msgid="8418930333779132418">"Kun når det er valgt andre moduser enn Stille"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c3864e8..30c5387 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Angitt vertsnavn er ikke gyldig."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Eksklusjonslisten er ikke riktig formatert. Legg inn en kommadelt liste med ekskluderte domener."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du må skrive inn et portnummer."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Du må fylle ut portfeltet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Angitt port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Krev personlig tallkode eller passord for å dekryptere nettbrettet hver gang du slår det på"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerisk personlig kode eller passord kreves for å dekryptere telefonen hver gang du slår den på"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kryptert"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Du kan kryptere kontoer, innstillinger, nedlastede apper med tilhørende data, mediefiler og andre filer. Når du har kryptert nettbrettet, må du angi en personlig tallkode eller et passord for å dekryptere det hver gang du slår det på. Du kan bare fjerne krypteringen på nettbrettet ved å utføre en tilbakestilling til fabrikkstandard, noe som medfører sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og sørge for at nettbrettet forblir tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene dine hvis du avbryter krypteringprosessen."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Du kan kryptere kontoer, innstillinger, nedlastede apper med tilhørende data, mediefiler og andre filer. Når du har kryptert telefonen, må du angi en personlig tallkode eller et passord for å dekryptere den hver gang du slår den på. Du kan bare fjerne krypteringen på telefonen ved å gjenopprette fabrikkinnstillingene, noe som vil medføre sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og holde telefonen tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene dine hvis du avbryter krypteringprosessen."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer nettbrettet ditt, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere nettbrettet hver gang du slår det på. Du kan ikke fjerne krypteringen av nettbrettet uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet."\n\n"Det tar minst en time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at nettbrettet er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer telefonen din, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere telefonen hver gang du slår den på. Du kan ikke fjerne krypteringen av telefonen uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet."\n\n"Det tar minst en time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at telefonen er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter nettbrett"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lad batteriet og prøv på nytt."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sett inn laderen og prøv på nytt."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen personlig kode eller passord for å låse skjermen."</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Du må angi personlig kode eller passord for låsing av skjerm før du kan starte kryptering."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du må angi en PIN-kode eller et passord for skjermlås før du kan starte krypteringen."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekreft kryptering"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vil du kryptere nettbrettet? Handlingen kan ikke angres, og hvis du avbryter den, kommer du til å miste data. Kryptering tar minst én time, og nettbrettet starter på nytt flere ganger underveis."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vil du kryptere telefonen? Handlingen kan ikke angres, og hvis du avbryter den, kommer du til å miste data. Kryptering tar minst én time, og telefonen kommer til å starte på nytt flere ganger underveis."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv på nytt om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Skriv inn passordet"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykket"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige. "\n\n" For å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige. "\n\n"For å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige."\n\n"For å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige."\n\n"For å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Velg skjermlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Velg reservelås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skjermlås"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Dra sidelengs"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ansiktslås"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sikret med mønster"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Sikret med PIN-kode"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Sikret med passord"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Mønster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kode"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Passord"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå av skjermlås"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern opplåsingsmønster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern PIN-koden for opplåsing"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musikkeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringevolum"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved stille modus"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrer og ring"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrering"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standard varsling"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"La varsellampen pulsere"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen er ikke plassert i forankringsstasjonen"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Innstillinger for festet forankring"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Finner ikke forankringsstasjon"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Du må forankre nettbrettet før du konfigurerer forankringslyd."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Du må forankre telefonen før du konfigurerer forankringslyden."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du må dokke nettbrettet før du konfigurerer dokklyden."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Du må dokke telefonen før du konfigurerer dokklyden."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Lyd ved innsetting i forankringsstasjon"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Spill av lyd når nettbrettet settes inn eller tas ut av forankringsstasjonen"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Spill av lyd når telefonen settes inn eller tas ut av forankringsstasjonen"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vil du slette alle dine personlige opplysninger og nedlastede apper? Du kan ikke reversere denne handlingen!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Fjern alt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn opplåsingsmønsteret"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestilling til fabrikkstandard."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestillingen til fabrikkstandard."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Tilbakestilling ble ikke utført fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du tilbakestille?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slett USB-lagring"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vil du slette SD-kortet og alle filene som er lagret der? Du kan ikke reversere denne handlingen!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slett alt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Tegn opplåsingsmønsteret"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av USB-lagring."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du må tegne opplåsingsmønsteret for å bekrefte slettingen av SD-kortet."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av USB-lagring."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtaleinnstillinger"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tilknytning"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Neste"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Slik sikrer du nettbrettet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sikring av telefonen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Beskytt nettbrettet mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste skjermbilde kan du dra fingeren fra prikk til prikk i en hvilken som helst rekkefølge. Du må forbinde minst fire prikker."\n\n"Klar til å begynne? Berør Neste."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskytt nettbrettet mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste side kan du dra fingeren fra prikk til prikk i en hvilken som helst rekkefølge. Du må binde sammen minst fire prikker."\n\n"Er du klar til å begynne? Trykk på Neste."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskytt telefonen mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste skjermbilde drar du fingeren rundt for å danne et vilkårlig mønster mellom minst fire punkter. "\n\n"Når du er du klar til å begynne, trykker du på Neste."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apper"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerte apper"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Legg på med På-/Av-knapp"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Les inn passord"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Utforsk ved berøring"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Når funksjonen for berøringsutforsking er slått på, kan du høre eller se beskrivelser av hva som er under fingeren din. "\n" "\n" Denne funksjonen er beregnet for svaksynte brukere."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Forsinkelse på trykk-og-hold-inne"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ingen tjenester er installert"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Trenger du en skjermleser?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback gir muntlig tilbakemelding for å hjelpe blinde og svaksynte brukere. Vil du installere denne appen gratis fra Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vil du installere nettskripter?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vil du at appene skal installere skripter fra Google som kan bidra til å gjøre nettinnholdet deres mer tilgjengelig?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Denne funksjonen endrer måten enheten din reagerer på berøring på. Vil du slå på funksjonen?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Beskrivelse ble ikke oppgitt."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Legitimasjonslageret ble tømt."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Leg.lageret kan ikke slettes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Akkreditivlageret er aktivert."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Du må angi en personlig kode for låseskjermen eller passord før du kan bruke legitimasjonslagring."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du må angi en PIN-kode eller et passord for skjermlås før du kan bruke legitimasjonslagring."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velg oppførsel når en nødsamtale opprettes"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sikkerhetskopier/tilbakestilling"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Forhåndsdelt nøkkel for IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Brukersertifikat for IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA-sertifikat"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Tjenersertifikat for IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Vis avanserte alternativer"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-søkedomener"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-servere (f.eks. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Lagre kontoinformasjon"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ikke brukt)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ikke bekreft tjener)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(mottatt fra tjeneren)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Avbryt"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Lagre"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Koble til"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Fullfør"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Stopp veil."</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Leksjon 1: Utforsking av skjermen"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Når du slår på funksjonen for berøringsutforsking, kan du berøre skjermen for å finne ut hva som er under fingeren din. Eksempel: Den gjeldende skjermen inneholder appikoner. Finn ett av dem ved å berøre skjermen og skyve fingeren rundt."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Når du slår på funksjonen for berøringsutforsking, kan du trykke på skjermen for å finne ut hva som er under fingeren din. Eksempelvis inneholder den gjeldende siden appikoner. Finn ett av dem ved å trykke på skjermen og skyve fingeren rundt."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bra. Fortsett å skyve fingeren rundt på skjermen til du finner minst ett ikon til."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Du kan aktivere noe du berører ved å trykke på det. Skyv fingeren rundt til du finner ikonet for <xliff:g id="APP_NAME">%s</xliff:g>. Deretter trykker du på ikonet én gang for å aktivere det."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Fingeren din berører ikonet <xliff:g id="APP_NAME">%s</xliff:g>. Trykk én gang for å aktivere ikonet."</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 755196b..33cf2d1 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Verwisselbare SD-kaart"</item>
     <item msgid="4498124044785815005">"Het systeem laten bepalen"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Uit"</item>
-    <item msgid="4804571292609523335">"Trillen"</item>
-    <item msgid="595707141547423573">"Dempen"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Altijd"</item>
+    <item msgid="6293147072807231256">"Nooit"</item>
+    <item msgid="1276641209451816572">"Alleen in de stille modus"</item>
+    <item msgid="8418930333779132418">"Alleen buiten de stille modus"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 83e07ff..41a79dd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"De hostnaam die u heeft ingevoerd, is ongeldig."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"De getypte uitsluitingslijst is niet correct opgemaakt. Geef een door komma\'s gescheiden lijst van uitgesloten domeinen op."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"U moet het poortveld invullen."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"U moet het veld voor de poort invullen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Het poortveld moet leeg zijn als het hostveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"De poort die u heeft ingevoerd, is ongeldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"De HTTP-proxy wordt gebruikt door de browser, maar mag niet worden gebruikt door de andere apps."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Een numerieke PIN-code of wachtwoord vereisen om uw tablet te decoderen wanneer u deze inschakelt"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Een numerieke PIN-code of wachtwoord vereisen om uw telefoon te decoderen wanneer u deze inschakelt"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Gecodeerd"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw tablet heeft gecodeerd, moet u een numerieke pincode of wachtwoord opgeven om de tablet te decoderen wanneer u deze inschakelt. U kunt de codering van uw tablet alleen ongedaan maken door de fabrieksinstellingen te herstellen. Als u dit doet, worden al uw gegevens gewist."\n\n"Het coderen duurt een uur of langer. U moet beginnen met een opgeladen accu en moet de tablet aangesloten laten op het stopcontact tot het coderen is voltooid. Als u het coderingsproces onderbreekt, gaan sommige of alle gegevens verloren."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw telefoon heeft gecodeerd, moet u een numerieke pincode of wachtwoord opgeven om de telefoon te decoderen telkens wanneer u deze inschakelt. U kunt de codering van uw telefoon alleen ongedaan maken door de fabrieksinstellingen te herstellen. Als u dit doet, worden al uw gegevens gewist."\n\n"Het coderen duurt een uur of langer. U moet beginnen met een opgeladen accu en moet de telefoon aangesloten laten op het stopcontact tot het coderen is voltooid. Als u het coderingsproces onderbreekt, gaan sommige of alle gegevens verloren."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw tablet heeft gecodeerd, moet u telkens een pincode of wachtwoord opgeven om de tablet te decoderen wanneer u deze opstart. U kunt uw tablet anders niet decoderen zonder de fabrieksinstellingen te herstellen, waardoor al uw gegevens worden gewist."\n\n"Het coderen kan een uur of langer duren. U moet beginnen met een volledig opgeladen batterij en de tablet moet gedurende het coderen op de oplader aangesloten zijn. Als u het coderen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw telefoon heeft gecodeerd, moet u telkens een pincode of wachtwoord opgeven om de telefoon te decoderen wanneer u deze opstart. U kunt uw telefoon anders niet decoderen zonder de fabrieksinstellingen te herstellen, waardoor al uw gegevens worden gewist."\n\n"Het coderen kan een uur of langer duren. U moet beginnen met een volledig opgeladen batterij en de telefoon moet tijdens het coderen op de oplader aangesloten zijn. Als u het coderen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet coderen"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefoon coderen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laad de accu op en probeer het opnieuw."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sluit uw lader aan en probeer het opnieuw."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen PIN-code of wachtwoord voor schermvergrendeling"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"U moet een PIN-code of wachtwoord voor schermvergrendeling instellen voordat u de encryptie kunt starten."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"U moet een pincode of wachtwoord voor schermvergrendeling instellen voordat u de encryptie kunt starten."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Codering bevestigen"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Tablet encrypten? Deze bewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het encrypten duurt een uur of langer en de tablet wordt meerdere keren opnieuw opgestart."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Telefoon encrypten? Deze bewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het encrypten duurt een uur of langer en de telefoon wordt meerdere keren opnieuw opgestart."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer het over <xliff:g id="DELAY">^1</xliff:g> seconden opnieuw."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Typ uw wachtwoord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryptie mislukt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw tablet niet meer toegankelijk. "\n\n"Als u uw tablet weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de tablet instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw telefoon niet meer toegankelijk. "\n\n"Als u uw telefoon weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de telefoon instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw tablet niet meer toegankelijk. "\n\n"Als u uw tablet weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de tablet instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Het coderen is onderbroken en kan niet worden voltooid. Daardoor zijn de gegevens op uw telefoon niet meer toegankelijk. "\n\n"Als u uw telefoon weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de telefoon instelt na het herstel, krijgt u de mogelijkheid gegevens terug te zetten waarvan u een back-up heeft gemaakt in uw Google-account."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Schermvergr. select."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Back-upvergr. kiezen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Schermvergrendeling"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Vegen"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Beveiligd met patroon"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Beveiligd met een PIN-code"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Beveiligd met wachtwoord"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patroon"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Pincode"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Wachtwoord"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Schermvergrendeling uitschakelen"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ontgrendelingspatroon verwijderen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"PIN-code voor ontgrendelen verwijderen"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Muziekeffecten"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Belvolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Trillen indien stil"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Trillen en bellen"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Trillen"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standaardmelding"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Knipperen trackball"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Beltoon"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefoon niet gedockt"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Instellingen voor het gekoppelde dockstation"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dockstation niet gevonden"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"U moet de tablet in het dock plaatsen voordat u audio-instellingen voor het dock kunt instellen."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"U moet de telefoon in het dock plaatsen voordat u audio-instellingen voor het dock kunt instellen."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"U moet de tablet in het dock plaatsen voordat u audio-instellingen voor het dock kunt instellen."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"U moet de telefoon in het dock plaatsen voordat u audio-instellingen voor het dock kunt instellen."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Geluid voor plaatsing in dockstation"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Geluid afspelen wanneer de tablet in het dockstation wordt geplaatst of uit het dockstation wordt verwijderd"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Geluid afspelen wanneer de telefoon in het dock wordt geplaatst of uit het dock wordt verwijderd"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Wilt u al uw persoonlijke gegevens en gedownloade apps verwijderen? U kunt deze actie niet ongedaan maken."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles wissen"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken uw ontgrendelingspatroon"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"U moet uw ontgrendelingspatroon tekenen om het terugzetten van de fabriekswaarden te bevestigen."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"U moet uw ontgrendelingspatroon tekenen om het terugzetten op de fabrieksinstellingen te bevestigen."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Opnieuw instellen?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-opslag wissen"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD-kaart wissen en alle opgeslagen bestanden verwijderen? U kunt deze actie niet ongedaan maken."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles wissen"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teken uw ontgrendelingspatroon"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de USB-opslag wilt formatteren."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de SD-kaart wilt wissen."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de USB-opslag wilt wissen."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de SD-kaart wilt wissen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellingen"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Uw tablet beveiligen"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Uw telefoon beveiligen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Beveilig uw tablet tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beveilig uw tablet tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beveilig uw telefoon tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps beheren"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Geïnstalleerde apps beheren en verwijderen"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systeem"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Grote tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Aan/uit-knop beëindigt oproep"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Wachtwoorden voorlezen"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Verkennen via aanraking"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Als verkennen via aanraking is ingeschakeld, kunt u beluisteren of bekijken wat u met uw vinger aanraakt."\n\n" Deze functie is bedoeld voor slechtziende gebruikers."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Vertraging voor blijven aanraken"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen services geïnstalleerd"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Heeft u een schermlezer nodig?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack levert gesproken feedback om blinde en slechtziende gebruikers te helpen navigeren. Wilt u deze app gratis installeren via Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Webscripts installeren?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Wilt u dat apps scripts installeren van Google waardoor de webinhoud van de apps toegankelijker wordt?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Deze functie past de manier aan waarop uw apparaat reageert op aanraking. Inschakelen?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beschrijving opgegeven."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Opslag van referenties is gewist."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Kan referentieopslag niet wissen."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"De opslag van referenties is ingeschakeld."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"U moet een pincode of wachtwoord voor het vergrendelen van het scherm instellen voordat u de referentieopslag kunt gebruiken."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"U moet een pincode of wachtwoord voor het vergrendelen van het scherm instellen voordat u de referentieopslag kunt gebruiken."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Back-up maken en opnieuw instellen"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Van tevoren gedeelde IPSec-sleutel"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-gebruikerscertificaat"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"CA-certificaat voor IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec-servercertificaat"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Geavanceerde opties weergeven"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-zoekdomeinen"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-servers (bijv. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Accountgegevens opslaan"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(niet gebruikt)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(server niet verifiëren)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(ontvangen van server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Annuleren"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Opslaan"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Verbinding maken"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Voltooien"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Overslaan"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Les 1: Het scherm verkennen"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Nadat u \'Verkennen via aanraking\' heeft ingeschakeld, kunt u het scherm aanraken voor informatie over de items onder uw vinger. Het huidige scherm bevat bijvoorbeeld app-pictogrammen. Zoek een pictogram door het scherm aan te raken en uw vinger over het scherm te bewegen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Wanneer \'Verkennen via aanraking\' is ingeschakeld, kunt u het scherm aanraken voor informatie over de items onder uw vinger. Het huidige scherm bevat bijvoorbeeld app-pictogrammen. Zoek een pictogram door het scherm aan te raken en uw vinger over het scherm te bewegen."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Goed zo, houd uw vinger op het scherm en veeg heen en weer tot u minimaal nog één pictogram heeft gevonden."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Als u iets wilt activeren dat u aanraakt, tikt u erop. Veeg met uw vinger tot u het pictogram voor <xliff:g id="APP_NAME">%s</xliff:g> heeft gevonden. Tik vervolgens op het pictogram om dit te activeren."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Uw vinger raakt het pictogram <xliff:g id="APP_NAME">%s</xliff:g> aan. Tik eenmaal om het pictogram te activeren."</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 9e33c75..0597a92 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Wymienna karta SD"</item>
     <item msgid="4498124044785815005">"Zastosuj ustawienie systemowe"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Wyłącz"</item>
-    <item msgid="4804571292609523335">"Wibracje"</item>
-    <item msgid="595707141547423573">"Wycisz"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Zawsze"</item>
+    <item msgid="6293147072807231256">"Nigdy"</item>
+    <item msgid="1276641209451816572">"W trybie cichym"</item>
+    <item msgid="8418930333779132418">"Poza trybem cichym"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krótkie"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6efe773..c1e251f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Wpisana nazwa hosta jest nieprawidłowa."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Wpisana lista wykluczeń jest niepoprawnie sformatowana. Wykluczone domeny muszą być rozdzielone przecinkami."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Należy uzupełnić pole port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Musisz wypełnić pole portu."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pole port musi być puste, jeśli pole host jest puste."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Wpisany port jest nieprawidłowy."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Serwer proxy HTTP jest używany przez przeglądarkę, ale inne aplikacje mogą go nie używać."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania tabletu przy każdym uruchomieniu"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania telefonu przy każdym uruchomieniu"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowane"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Po zaszyfrowaniu konieczne będzie wpisywanie kodu PIN lub hasła przy każdym uruchomieniu tabletu, aby odszyfrować dane. Trwałe odszyfrowanie tabletu jest możliwe jedynie przez przywrócenie danych fabrycznych, a tym samym usunięcie wszystkich danych."\n\n"Szyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj tabletu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Po zaszyfrowaniu konieczne będzie wpisywanie kodu PIN lub hasła przy każdym uruchomieniu telefonu, aby odszyfrować dane. Odszyfrowanie telefonu jest możliwe jedynie przez przywrócenie danych fabrycznych, a tym samym usunięcie wszystkich danych."\n\n"Szyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu tabletu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia: tablet można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych."\n\n"Szyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj tabletu od zasilania do chwili ukończenia szyfrowania. Jeśli proces szyfrowania zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu telefonu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia: telefon można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych."\n\n"Szyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj telefonu od zasilania do chwili ukończenia szyfrowania. Jeśli proces szyfrowania zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Zaszyfruj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Naładuj baterię i spróbuj ponownie."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Podłącz ładowarkę i spróbuj ponownie."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Brak kodu PIN lub hasła blokowania ekranu"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Przed rozpoczęciem szyfrowania musisz ustawić kod PIN lub hasło blokowania ekranu."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Przed rozpoczęciem szyfrowania musisz ustawić kod PIN lub hasło blokady ekranu."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potwierdź szyfrowanie"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Zaszyfrować tablet? Ta operacja jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie potrwa co najmniej godzinę, a tablet w tym czasie kilka razy uruchomi się ponownie."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Zaszyfrować telefon? Ta operacja jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie potrwa co najmniej godzinę, a telefon w tym czasie kilka razy uruchomi się ponownie."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Spróbuj ponownie za <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Wpisz swoje hasło."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Szyfrowanie zakończone niepowodzeniem"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. "\n\n"Aby dalej używać tabletu, należy przywrócić dane fabryczne. Podczas konfiguracji po resecie będziesz mieć możliwość przywrócenia danych zapisanych na koncie Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. "\n\n"Aby dalej używać telefonu, należy przywrócić dane fabryczne. Podczas konfiguracji po resecie będziesz mieć możliwość przywrócenia danych zapisanych na koncie Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. "\n\n"Aby dalej używać tabletu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. "\n\n"Aby dalej używać telefonu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Wybierz blokadę ekranu"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Wybierz blokadę zapasową"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blokada ekranu"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Przesunięcie palcem"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpieczenie wzorem"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zabezpieczenie kodem PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Zabezpieczenie hasłem"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Wzór"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Kod PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Hasło"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Wyłącz blokadę ekranu"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Usuń wzór odblokowania"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Usuń kod PIN odblokowania"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efekty muzyczne"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Głośność dzwonka"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Wibracje po wyciszeniu"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Wibracje i dzwonek"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Wibracje"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Powiadomienie domyślne"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsująca dioda"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Dzwonek"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon niezadokowany"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ustawienia dla podłączonej podstawki"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Nie znaleziono podstawki"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Przed skonfigurowaniem dźwięku stacji dokującej musisz zadokować tablet."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Przed skonfigurowaniem dźwięku stacji dokującej musisz zadokować telefon."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Przed skonfigurowaniem dźwięku stacji dokującej musisz zadokować tablet."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Przed skonfigurowaniem dźwięku stacji dokującej musisz zadokować telefon."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dźwięk włożenia do stacji dokującej"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Odtwarzaj dźwięk podczas umieszczania tabletu w doku i wyjmowania go"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Odtwarzaj dźwięk podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Wymazać wszystkie Twoje informacje osobiste i pobrane aplikacje? Tej czynności nie można cofnąć."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Wymaż wszystko"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Narysuj wzór odblokowania"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Aby potwierdzić przywrócenie danych fabrycznych, musisz narysować wzór odblokowania."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Aby potwierdzić przywrócenie danych fabrycznych, musisz narysować wzór odblokowania."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu jest niedostępna."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zresetować?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Wyczyść nośnik USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Wymazać kartę SD, usuwając wszystkie zapisane na niej pliki? Tej czynności nie można cofnąć."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Wymaż wszystko"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Narysuj wzór odblokowania"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ustawienia połączeń"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekazywanie połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering przez USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Dalej"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpieczanie tabletu"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpieczanie telefonu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Chroń swój tablet przed nieautoryzowanym użyciem, tworząc osobisty wzór odblokowania ekranu. Na następnym ekranie połącz palcem co najmniej cztery kropki w dowolnej kolejności. "\n\n"Wszystko gotowe? Wybierz Dalej."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Chroń swój tablet przed nieautoryzowanym użyciem, tworząc osobisty wzór odblokowania ekranu. Na następnym ekranie połącz palcem co najmniej cztery kropki w dowolnej kolejności. "\n\n"Wszystko gotowe? Wybierz Dalej."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Chroń swój telefon przed nieautoryzowanym użyciem, tworząc osobisty wzór odblokowania ekranu. Na następnym ekranie połącz palcem co najmniej cztery kropki w dowolnej kolejności. "\n\n"Wszystko gotowe? Wybierz Dalej."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Zarządzaj zainstalowanymi aplikacjami i usuwaj je."</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Duży tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Przycisk kończy rozmowę"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Wypowiadaj hasła na głos."</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Czytanie dotykiem"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Włączenie opcji czytania dotykiem powoduje wyświetlanie lub odczytywanie opisów elementów znajdujących się pod Twoim palcem."\n\n" Funkcja jest przeznaczona dla użytkowników z wadami wzroku."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Czas dotknięcia i przytrzymania"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Brak zainstalowanych usług"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrzebujesz czytnika ekranu?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack odczytuje zawartość ekranu, pomagając użytkownikom niewidomym i niedowidzącym. Czy chcesz zainstalować tę usługę za darmo z Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Zainstalować skrypty internetowe?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Czy chcesz, aby aplikacje instalowały skrypty od Google, które zwiększą dostępność treści internetowych?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ta funkcja zmienia sposób, w jaki urządzenie reaguje na dotyk. Włączyć ją?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Brak opisu"</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Wyczyszczono magazyn danych logowania."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Nie można wymazać magazynu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Magazyn danych logowania jest włączony."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Aby korzystać z magazynu danych logowania, musisz ustawić kod PIN lub hasło blokady ekranu."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Aby korzystać z magazynu danych logowania, musisz ustawić kod PIN lub hasło blokady ekranu."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Kopia i kasowanie danych"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Klucz wspólny IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certyfikat użytkownika IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certyfikat CA IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certyfikat serwera IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Pokaż opcje zaawansowane"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domeny wyszukiwania DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Serwery DNS (np. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Zapisz informacje o koncie"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(nieużywane)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(nie weryfikuj serwera)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(odebrany od serwera)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Anuluj"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Zapisz"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Połącz"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Zakończ"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Pomiń samouczek"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekcja 1: Poznawanie ekranu"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Po włączeniu trybu Czytanie dotykiem możesz dotknąć ekranu, aby sprawdzić, co jest pod Twoim palcem. Na przykład bieżący ekran zawiera ikony aplikacji. Znajdź jedną z nich, dotykając ekranu i przesuwając po nim palcem."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Po włączeniu Czytania dotykiem możesz dotknąć ekranu, aby sprawdzić, co jest pod Twoim palcem. Na przykład bieżący ekran zawiera ikony aplikacji. Znajdź jedną z nich, dotykając ekranu i przesuwając po nim palcem."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobrze. Przesuwaj palcem po ekranie, aż znajdziesz jeszcze co najmniej jedną ikonę."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Aby użyć elementu pod palcem, dotknij go. Przesuwaj palcem, aż znajdziesz ikonę aplikacji <xliff:g id="APP_NAME">%s</xliff:g>. Następnie dotknij jej jeden raz, aby użyć."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Twój palec jest na ikonie aplikacji <xliff:g id="APP_NAME">%s</xliff:g>. Dotknij jej jeden raz, aby użyć."</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 39388dd..2001dea 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Cartão SD amovível"</item>
     <item msgid="4498124044785815005">"Permitir que seja o sistema a decidir"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desativado"</item>
-    <item msgid="4804571292609523335">"Vibrar"</item>
-    <item msgid="595707141547423573">"Desativar som"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Sempre"</item>
+    <item msgid="6293147072807231256">"Nunca"</item>
+    <item msgid="1276641209451816572">"Apenas em modo silencioso"</item>
+    <item msgid="8418930333779132418">"Apenas quando não estiver em modo silencioso"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curta"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 87f056e..26c6946 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"O nome de anfitrião que introduziu não é válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"A lista de exclusão introduzida não está formatada corretamente. Introduza uma lista de domínios excluídos separados por vírgulas."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"É necessário preencher o campo referente à porta."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"É necessário preencher o campo referente à porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo referente à porta tem de estar vazio se o campo do anfitrião estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A porta introduzida não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é utilizado pelo navegador, mas não pode ser utilizado por outras aplicações."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o tablet sempre que o ligar"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o telefone sempre que o ligar"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"É possível encriptar as suas contas, definições, aplicações transferidas e respetivos dados, multimédia e outros ficheiros. Após encriptar o tablet, deverá introduzir um PIN numérico ou palavra-passe para o desencriptar sempre que o ligar: não é possível desencriptar o tablet, exceto se executar uma reposição de dados de fábrica, o que apagará todos os seus dados."\n\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o tablet ligado até que a encriptação fique concluída. Caso interrompa o processo de encriptação, perderá alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"É possível encriptar as suas contas, definições, aplicações transferidas e respetivos dados, multimédia e outros ficheiros. Após encriptar o telemóvel, deverá introduzir um PIN numérico ou palavra-passe para o desencriptar sempre que o ligar: não é possível desencriptar o telemóvel, exceto se executar uma reposição de dados de fábrica, o que apagará todos os seus dados."\n\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel ligado até que a encriptação fique concluída. Caso interrompa o processo de encriptação, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Pode encriptar contas, definições, aplicações e dados transferidos, multimédia e outros ficheiros. Após encriptar o tablet, é necessário introduzir um PIN numérico ou palavra-passe para o desencriptar cada vez que o ligar: não é possível desencriptar o tablet, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados."\n\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o tablet ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Pode encriptar contas, definições, aplicações e dados transferidos, multimédia e outros ficheiros. Após encriptar o telemóvel, é necessário introduzir um PIN numérico ou palavra-passe para o desencriptar cada vez que o ligar: não é possível desencriptar o telemóvel, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados."\n" "\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue a bateria e tente novamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ligue o carregador e tente novamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sem PIN nem palavra-passe de bloqueio de ecrã"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Deve definir um PIN ou palavra-passe de bloqueio de ecrã antes de poder iniciar a encriptação."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"É necessário configurar um PIN ou palavra-passe de bloqueio de ecrã antes de iniciar a encriptação."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptação"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Encriptar tablet? Esta operação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o tablet reiniciará várias vezes."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Encriptar telefone? Esta operação é irreversível e se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o telefone reiniciará várias vezes."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente dentro de <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduza a palavra-passe"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptação sem êxito"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu tablet já não estão acessíveis. "\n\n"Para voltar a utilizar o tablet, tem de efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. "\n\n"Para voltar a utilizar o telemóvel, tem de efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no tablet já não estão acessíveis. "\n\n"Para voltar a utilizar o tablet, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na Conta Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. "\n\n"Para voltar a utilizar o telemóvel, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Selec. bloqueio do ecrã"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Escolher bloq. cópia seg."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de ecrã"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Deslizar"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueio Através do Rosto"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com sequência"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protegido com PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegido com palavra-passe"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequência"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Palavra-passe"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueio do ecrã"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos musicais"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar quando estiver em silêncio"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrar e tocar"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Notificação predefinida"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Sinalizar luz de notificação"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefone não ancorado"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Definições da estação de ancoragem acoplada"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Estação de ancoragem não encontrada"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Deve ancorar o tablet antes de configurar o áudio da estação de ancoragem."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Deve ancorar o telemóvel antes de configurar o áudio da estação de ancoragem."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"É necessário ancorar o tablet antes de configurar o áudio da estação de ancoragem."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"É necessário ancorar o telemóvel antes de configurar o áudio da estação de ancoragem."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Som de inserção da estação de ancoragem"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproduzir som ao inserir ou remover o tablet da estação de ancoragem"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproduzir som ao inserir ou remover o telefone da estação de ancoragem"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Apagar todas as informações pessoais e aplicações transferidas? Não é possível reverter esta ação!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Tem de desenhar a sua sequência de desbloqueio para confirmar uma reposição dos dados de fábrica."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"É necessário desenhar a sequência de desbloqueio para confirmar uma reposição de dados de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Não foi efetuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Repor?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Apagar o cartão SD, eliminando todos os ficheiros armazenados? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Tem de desenhar a sequência de desbloqueio para confirmar que pretende formatar o armazenamento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Tem de desenhar a sequência de desbloqueio para confirmar que pretende apagar o cartão SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"É necessário desenhar a sequência de desbloqueio para confirmar que pretende apagar a memória de armazenamento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"É necessário desenhar a sequência de desbloqueio para confirmar que pretende apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Definições de chamadas"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio de voz, reencaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ligação USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Seguinte"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Manter a segurança do tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Manter o telefone seguro"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Proteja o tablet contra a utilização não autorizada, criando uma sequência de desbloqueio do ecrã pessoal. Deslize lentamente o dedo para ligar os pontos por qualquer ordem no ecrã seguinte. Tem de ligar, pelo menos, quatro pontos. "\n\n"Pronto para começar? Toque em Seguinte."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteja o tablet contra a utilização não autorizada, criando uma sequência pessoal de desbloqueio do ecrã. Deslize lentamente o dedo para ligar os pontos por qualquer ordem no ecrã seguinte. É necessário ligar, pelo menos, quatro pontos. "\n\n"Pronto para começar? Toque em Seguinte."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteja o telemóvel contra a utilização não autorizada, criando uma sequência de desbloqueio do ecrã pessoal. Deslize lentamente o dedo para ligar, pelo menos, quatro pontos por qualquer ordem no ecrã seguinte. "\n\n"Pronto para começar? Toque em Seguinte."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerir e remover aplicações instaladas"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"SISTEMA"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"O botão ligar/desl.termina a chm"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Dizer palavras-passe"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explorar pelo toque"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quando Explorar pelo Toque estiver ativado, poderá ouvir ou ver as descrições do que está por baixo do seu dedo."\n\n"Esta funcionalidade destina-se a utilizadores com pouca visão."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Atraso ao manter premida a tecla"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço instalado"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Necessita de um leitor de ecrã?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece respostas faladas para ajudar os utilizadores invisuais e com deficiência visual. Pretende instalá-lo gratuitamente a partir do Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalar scripts Web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Pretende que as aplicações instalem scripts do Google que tornam o respetivo conteúdo Web mais acessível?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Esta funcionalidade altera o modo como o aparelho responde ao toque. Ativar?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição fornecida."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Armaz. credenciais apagado."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Não foi possível apagar o armazenamento de credenciais."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está activado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Para poder utilizar o armazenamento de credenciais, tem de definir primeiro um PIN ou palavra-passe do ecrã de bloqueio."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder utilizar o armazenamento de credenciais, é necessário definir primeiro um PIN ou palavra-passe do ecrã de bloqueio."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Cópia de segurança e reposição"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Chave IPSec pré-partilhada"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificado do utilizador IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificado da AC IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certificado do servidor IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opções avançadas"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domínios de pesquisa DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores DNS (por exemplo, 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Guardar informações sobre a conta"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(não utilizado)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(não verificar servidor)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(recebido do servidor)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Cancelar"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Guardar"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Ligar"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Concluir"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ign. tutorial"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lição 1: Explorar o ecrã"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Após ativar a opção Explorar por Toque, poderá tocar no ecrã para saber o que está sob o dedo. Por exemplo, o ecrã atual contém ícones de aplicações. Toque no ecrã e deslize lentamente o dedo para localizar um deles."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Após ativar a opção Explorar por Toque, poderá tocar no ecrã para saber o que está sob o dedo. Por exemplo, o ecrã atual contém ícones de aplicações. Toque no ecrã e deslize lentamente o dedo para localizar um deles."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bom. Continue a deslizar o dedo pelo ecrã até localizar pelo menos mais um ícone."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Para ativar algo em que está a tocar, toque nisso. Deslize lentamente o dedo até localizar o ícone de <xliff:g id="APP_NAME">%s</xliff:g>. Em seguida, toque uma vez no ícone para o ativar."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"O seu dedo está a tocar no ícone <xliff:g id="APP_NAME">%s</xliff:g>. Toque uma vez para ativar o ícone."</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 45f0cf8..281f94d 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Cartão SD removível"</item>
     <item msgid="4498124044785815005">"Deixar o sistema decidir"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desativado"</item>
-    <item msgid="4804571292609523335">"Vibrar"</item>
-    <item msgid="595707141547423573">"Desativar som"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Sempre"</item>
+    <item msgid="6293147072807231256">"Nunca"</item>
+    <item msgid="1276641209451816572">"Somente no modo silencioso"</item>
+    <item msgid="8418930333779132418">"Somente fora do modo silencioso"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 86c27b3..0c42421 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"O nome de host digitado não é válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"A lista de exclusão digitada não está formatada corretamente. Insira uma lista dos domínios excluídos separados por vírgula."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Você deve completar o campo de porta."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"É necessário preencher o campo da porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo da porta deverá estar vazio se o campo do host estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A porta digitada não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros aplicativos."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicite um PIN ou uma senha numérica para decodificar seu tablet sempre que o ligar"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicite um PIN ou senha numérica para decodificar seu telefone sempre que o ligar"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"É possível criptografar contas, configurações, aplicativos baixados e seus dados, arquivos de mídia e outros arquivos. Depois que criptografar seu tablet, insira uma senha ou PIN numérico para descriptografar o dispositivo sempre que ligá-lo. Não é possível desfazer a criptografia do tablet, a menos que a configuração original de fábrica seja redefinida, o que apaga todos os seus dados."\n\n"A criptografia leva no mínimo uma hora. Você deve iniciar usando uma bateria carregada e manter o tablet conectado à tomada até que o processo seja concluído. Se houver interrupção, seus dados poderão ser perdidos parcial ou completamente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"É possível criptografar contas, configurações, aplicativos transferidos e seus dados, arquivos de mídia e outros arquivos. Depois que criptografar seu telefone, insira uma senha ou PIN numérico para descriptografar o telefone sempre que ligá-lo. Não é possível desfazer a criptografia do telefone, a menos que a configuração original de fábrica seja redefinida, o que apaga todos os seus dados."\n\n"A criptografia leva no mínimo uma hora. Você deve iniciar usando uma bateria carregada e manter o telefone conectado à tomada até que o processo seja concluído. Se houver interrupção, seus dados poderão ser perdidos parcialmente ou completamente."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Depois que você criptografar seu tablet, precisará digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu tablet, exceto realizando de uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Depois que você criptografar seu telefone, precisará digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu telefone, exceto realizando de uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptografar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptografar telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue sua bateria e tente novamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecte seu carregador e tente novamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Não há PIN ou senha da tela de bloqueio"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Defina um PIN ou uma senha para a tela de bloqueio antes de iniciar a criptografia."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"É necessário definir um PIN ou uma senha para a tela de bloqueio antes de iniciar a criptografia."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar criptografia"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Criptografar o tablet? Essa operação é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, sendo que nesse período o tablet será reiniciado várias vezes."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Criptografar o telefone? Essa operação é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, sendo que nesse período o telefone será reiniciado várias vezes."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente em <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digite sua senha"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Falha na criptografia"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. "\n\n" Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar quaisquer dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. "\n\n"Para continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar quaisquer dados que foram salvos em backup em sua Conta do Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. "\n\n" Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu tablet após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. "\n\n"Para continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Selecionar bloqueio de tela"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Selec. o bloq. de backup"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Deslizar"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueio facial"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com padrão"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protegido com PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegido com senha"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Padrão"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Senha"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desativar o bloqueio da tela"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos sonoros"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar no modo silencioso"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrar e tocar"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Notificação padrão"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsar luz de notificação"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefone não encaixado"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configurações para o dock anexo"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock não encontrado"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Você deve encaixar o tablet antes de configurar o áudio do dock."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Você deve encaixar o telefone antes de configurar o áudio do dock."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"É necessário que você encaixe seu tablet antes de configurar o áudio do dock."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"É necessário que você encaixe o telefone antes de configurar o áudio do dock."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Som de inserção no dock"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproduzir sons ao inserir ou remover o tablet do dock"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproduzir sons ao inserir ou remover o telefone do dock."</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Apagar todas as suas informações pessoais e os aplicativos transferidos? Não é possível reverter esta ação!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Você precisa desenhar seu padrão de desbloqueio para confirmar uma redefinição da configuração original."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"É necessário que você desenhe seu padrão de desbloqueio para confirmar uma redefinição para configuração original."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Redefinir?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Apagar o cartão SD, excluindo todos os arquivos armazenados nele? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Você deve desenhar sua sequência de desbloqueio para confirmar que deseja apagar o armazenamento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Você deve desenhar sua sequência de desbloqueio para confirmar que deseja apagar o cartão SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"É necessário que você desenhe seu padrão de desbloqueio para confirmar que deseja apagar o armazenamento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"É necessário que você desenhe seu padrão de desbloqueio para confirmar que deseja apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Conf. de chamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Vínculo USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Avançar"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Como proteger seu tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Proteção do seu telefone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Proteja seu tablet contra uso não autorizado criando uma sequência de desbloqueio de tela pessoal. Deslize o dedo para ligar os pontos em qualquer ordem na próxima tela. Você deve conectar pelo menos quatro pontos. "\n\n"Pronto para começar? Toque em Próximo."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteja seu tablet contra uso não autorizado criando um padrão de desbloqueio de tela pessoal. Deslize o dedo para ligar os pontos em qualquer ordem na próxima tela. Será necessário que você conecte pelo menos quatro pontos. "\n\n"Pronto para começar? Toque em Próximo."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteja seu telefone contra uso não autorizado criando uma sequência de desbloqueio de tela pessoal. Deslize o dedo para ligar pelo menos quatro pontos em qualquer ordem na próxima tela. "\n\n"Pronto para começar? Toque em Próximo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerenciar aplicativos"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerenciar e remover aplicativos instalados"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Botão Liga/desliga encerra a chamada"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Falar senhas"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explorar pelo toque"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quando a opção Explorar pelo toque está ativada, você pode ouvir ou ver as descrições do que está sob seu dedo."\n\n" Esse recurso é para usuários com pouca visão."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Atraso ao tocar e pressionar"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço foi instalado"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Precisa de um leitor de tela?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece feedback por voz para ajudar usuários cegos ou com visão reduzida. Deseja instalá-lo gratuitamente do Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalar scripts da web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Deseja que seus aplicativos instalem scripts do Google para que seu conteúdo da web seja mais acessível?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Este recurso muda a forma como seu dispositivo responde ao toque. Deseja ativá-lo?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição foi fornecida."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"O armazenamento de credenciais foi apagado."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Armaz. de creden. não apagado."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais foi ativado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Você deve configurar um PIN ou senha da tela de bloqueio antes de usar o armazenamento de credenciais."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"É necessário configurar PIN ou senha para a tela de bloqueio antes de usar o armazenamento de credenciais."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Fazer backup e redefinir"</string>
@@ -1525,8 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Chave pré-compartilhada IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificado de usuário IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificado CA IPSec"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opções avançadas"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domínios de pesquisa de DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores de DNS (por exemplo, 8.8.8.8)"</string>
@@ -1536,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Salvar informações sobre a conta"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"Não utilizado"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(não verificar servidor)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"Cancelar"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salvar"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Conectar"</string>
@@ -1561,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Concluir"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Pular tutorial"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lição 1: como explorar a tela"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Depois de ativar o recurso \"Explorar pelo toque\", você pode tocar na tela para saber o que está sob seu dedo. Por exemplo, a tela atual contém ícones de aplicativos. Encontre um deles tocando na tela e deslizando o dedo."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Quando o modo Explorar pelo toque é ativado, você pode tocar na tela para saber o que está sob seu dedo. Por exemplo, a tela atual contém ícones de aplicativos. Encontre um deles tocando na tela e deslizando o dedo."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Muito bem! Continue deslizando o dedo pela tela até encontrar pelo menos mais um ícone."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Para ativar um ícone que está sob seu dedo, toque nele. Deslize o dedo até encontrar o ícone para o <xliff:g id="APP_NAME">%s</xliff:g>. Depois, toque no ícone uma vez par ativá-lo."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Seu dedo está em cima do ícone do <xliff:g id="APP_NAME">%s</xliff:g>. Toque uma vez para ativar o ícone."</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 238bd05..e224769 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -181,9 +181,12 @@
     <item msgid="3738430123799803530">"Carta SD che po vegnir barattada"</item>
     <item msgid="4498124044785815005">"Laschar decider il sistem"</item>
   </string-array>
-    <!-- no translation found for silent_mode_entries:0 (783505504936446770) -->
-    <!-- no translation found for silent_mode_entries:1 (4804571292609523335) -->
-    <!-- no translation found for silent_mode_entries:2 (595707141547423573) -->
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Adina"</item>
+    <item msgid="6293147072807231256">"Mai"</item>
+    <item msgid="1276641209451816572">"Mo en il modus silenzius"</item>
+    <item msgid="8418930333779132418">"Mo sche betg en il modus silenzius"</item>
+  </string-array>
     <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
     <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
     <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 3f57c0f..f8ed066 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1509,8 +1509,6 @@
     <skip />
     <!-- no translation found for accessibility_service_no_apps_message (7751662416377046539) -->
     <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning_title (4158946557435736650) -->
-    <skip />
     <!-- no translation found for accessibility_script_injection_security_warning_summary (7706858873495386310) -->
     <skip />
     <!-- no translation found for accessibility_touch_exploration_warning (2442154805472989569) -->
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index ea8991c..38507f1 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Card SD detaşabil"</item>
     <item msgid="4498124044785815005">"Permiteţi sistemului să decidă"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Oprit"</item>
-    <item msgid="4804571292609523335">"Vibrare"</item>
-    <item msgid="595707141547423573">"Dezactivaţi sunetul"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Întotdeauna"</item>
+    <item msgid="6293147072807231256">"Niciodată"</item>
+    <item msgid="1276641209451816572">"Numai în modul Silenţios"</item>
+    <item msgid="8418930333779132418">"Numai când modul nu este Silenţios"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 28651c5..5547fe0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Numele de gazdă introdus nu este valid."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Lista de excludere introdusă nu este formatată corect. Introduceţi o listă cu valori separate prin virgulă pentru domeniile excluse."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Trebuie să completaţi câmpul pentru port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Trebuie să completaţi câmpul pentru port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Câmpul pentru port trebuie să fie necompletat în situaţia în care câmpul pentru gazdă este necompletat."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Portul introdus nu este valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicaţii."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesită un cod PIN numeric sau o parolă de decriptare a tabletei la fiecare pornire a acesteia"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necesită un cod PIN numeric sau o parolă de decriptare a telefonului la fiecare pornire a acestuia"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea tabletei, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a o decripta de fiecare dată când o porniţi: nu puteţi anula criptarea decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe aceasta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi tableta conectată până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a-l decripta de fiecare dată când îl porniţi: nu puteţi anula criptarea decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe acesta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea tabletei, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a o decripta de fiecare dată când o porniţi: nu puteţi anula criptarea decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe aceasta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi tableta conectată până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a-l decripta de fiecare dată când îl porniţi: nu puteţi anula criptarea decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe acesta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptaţi tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptaţi telefonul"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcaţi bateria şi încercaţi din nou."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conectaţi încărcătorul şi încercaţi din nou."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Înainte de a începe criptarea, trebuie să setaţi un cod PIN sau o parolă de blocare a ecranului."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebuie să setaţi un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmaţi criptarea"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Criptaţi tableta? Această operaţie este ireversibilă şi întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care tableta se va reporni de mai multe ori."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Criptaţi telefonul? Această operaţie este ireversibilă şi întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care telefonul se va reporni de mai multe ori."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Încercaţi din nou peste <xliff:g id="DELAY">^1</xliff:g> (de) secunde."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereuşită"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Selectaţi bloc. ecran."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Aleg. blocare rezervă"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Fără"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Glisare"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Deblocare facială"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Securizat cu model"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Securizat cu PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Securizat cu parolă"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Model"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parolă"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Activaţi blocarea ecranului"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminaţi modelul pentru deblocare"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminaţi codul PIN de deblocare"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efecte muzicale"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum sonerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrează la profilul Silenţios"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrare şi sunet"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrare"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Notificare prestabilită"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos de notificare prin pulsaţie"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ton de apel"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonul nu este andocat"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Setări pentru dispozitivul de andocare ataşat"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dispozitivul de andocare nu a fost găsit"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Trebuie să andocaţi tableta înainte de configurarea dispozitivului de andocare audio."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Trebuie să andocaţi telefonul înainte de configurarea dispozitivului de andocare audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Trebuie să andocaţi tableta înainte de configurarea dispozitivului de andocare audio."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Trebuie să andocaţi telefonul înainte de configurarea dispozitivului de andocare audio."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sunet de inserare în dispozitivul de andocare"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Doresc să se redea sunet la inserarea sau scoaterea tabletei din dispozitivul de andocare"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Redaţi sunet la introducerea sau la scoaterea telefonului din dispozitivul de andocare"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Ştergeţi toate informaţiile personale şi aplicaţiile descărcate? Nu puteţi anula această acţiune!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ştergeţi tot"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenaţi modelul pentru deblocare"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma resetarea configurării din fabrică."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Trebuie să desenaţi modelul de deblocare pentru a confirma resetarea configurării din fabrică."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nu a fost efectuată nicio resetare, deoarece serviciul Golire sistem nu este disponibil."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetaţi?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ştergeţi stocarea USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ştergeţi cardul SD şi toate fişierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ştergeţi tot"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenaţi modelul pentru deblocare"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma că doriţi ştergerea stocării USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Trebuie să desenaţi modelul pentru deblocare, pentru a confirma că doriţi să ştergeţi cardul SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi stocarea USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi cardul SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setări apel"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Activaţi mesageria vocală, redirecţionarea apelurilor, apelul în aşteptare, ID apelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering prin USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Înainte"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Securizarea tabletei"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Securizarea telefonului"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Protejaţi tableta împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, în orice ordine doriţi, punctele de pe ecranul următor. Trebuie să conectaţi cel puţin patru puncte. "\n\n"Sunteţi gata să începeţi? Atingeţi „Înainte”."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protejaţi tableta împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, în orice ordine doriţi, punctele de pe ecranul următor. Trebuie să conectaţi cel puţin patru puncte. "\n\n"Sunteţi gata să începeţi? Atingeţi „Înainte”"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protejaţi telefonul împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, în orice ordine doriţi, cel puţin patru puncte de pe ecranul următor. "\n\n"Sunteţi gata să începeţi? Atingeţi Înainte."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionaţi aplicaţii"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionaţi şi eliminaţi aplicaţiile instalate"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Text mare"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Butonul de pornire finaliz. apelul"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Rostiţi parolele"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Exploraţi prin atingere"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Când funcţia Exploraţi prin atingere este activată, puteţi auzi sau vedea descrieri pentru ceea ce se află sub degetul dvs."\n\n" Această funcţie este destinată utilizatorilor cu probleme de vedere."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Întâr. pt. Ating. şi menţ. apăs."</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nu există servicii instalate"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Aveţi nevoie de un cititor de ecran?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Serviciul TalkBack oferă feedback vocal pentru a ajuta utilizatorii nevăzători şi cu probleme de vedere. Doriţi să îl instalaţi în mod gratuit din Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalaţi scripturile web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Doriţi ca aplicaţiile să instaleze scripturi de la Google, care să facă mai accesibil conţinutul web al acestora?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Această funcţie schimbă modul în care dispozitivul dvs. răspunde la atingere. Activaţi?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nu a fost furnizată o descriere."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Stoc. acredit. este ştearsă."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Nu s-a şters sp. stoc. cert."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stocarea acreditărilor este activată."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Trebuie să setaţi un cod PIN sau o parolă de blocare a ecranului înainte de a putea utiliza spaţiul de stocare a certificatelor."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebuie să setaţi un cod PIN sau o parolă pentru blocarea ecranului înainte de a putea utiliza spaţiul de stocare a certificatelor."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urgenţă"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setaţi comportamentul la efectuarea unui apel de urgenţă"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Creaţi o copie de rezervă şi resetaţi"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Cheie IPSec predistribuită"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificat de utilizator IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificat CA IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certificat de server IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Afişaţi opţiunile avansate"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domenii de căutare DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Serverele DNS (de ex., 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Salvaţi informaţiile contului"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(neutilizat)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(nu verificaţi serverul)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(primit de la server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Anulaţi"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salvaţi"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Conectaţi"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalizaţi"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ign. inst."</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lecţia 1: explorarea ecranului"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"După ce activaţi funcţia „Exploraţi prin atingere”, puteţi atinge ecranul pentru a afla ce se află sub degetul dvs. De exemplu, ecranul actual conţine pictograme de aplicaţii. Găsiţi una dintre acestea atingând ecranul şi glisând uşor cu degetul pe ecran."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Când funcţia Exploraţi prin atingere este activată, puteţi atinge ecranul pentru a afla ce se află sub degetul dvs. De exemplu, ecranul actual conţine pictograme de aplicaţii. Găsiţi una dintre acestea atingând ecranul şi glisând uşor cu degetul pe ecran."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Perfect. Continuaţi să glisaţi uşor degetul pe ecran până când veţi găsi cel puţin încă o pictogramă."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Pentru a activa o aplicaţie, apăsaţi pe pictograma corespunzătoare. Glisaţi uşor degetul până când găsiţi pictograma pentru <xliff:g id="APP_NAME">%s</xliff:g>. Apoi, apăsaţi pictograma o dată pentru a activa aplicaţia."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Degetul atinge pictograma <xliff:g id="APP_NAME">%s</xliff:g>. Apăsaţi o dată pentru a activa pictograma."</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 60f4c10..083004d 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -30,23 +30,23 @@
     <item msgid="8392017019801393511">"Все"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 сек."</item>
-    <item msgid="8881760709354815449">"30 сек."</item>
-    <item msgid="7589406073232279088">"1 мин."</item>
-    <item msgid="7001195990902244174">"2 мин."</item>
-    <item msgid="7489864775127957179">"5 мин."</item>
-    <item msgid="2314124409517439288">"10 мин."</item>
-    <item msgid="6864027152847611413">"30 мин."</item>
+    <item msgid="3342301044271143016">"15 секунд"</item>
+    <item msgid="8881760709354815449">"30 секунд"</item>
+    <item msgid="7589406073232279088">"1 минута"</item>
+    <item msgid="7001195990902244174">"2 минуты"</item>
+    <item msgid="7489864775127957179">"5 минут"</item>
+    <item msgid="2314124409517439288">"10 мин"</item>
+    <item msgid="6864027152847611413">"30 мин"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Никогда"</item>
-    <item msgid="2194151041885903260">"15 сек."</item>
-    <item msgid="5892295237131074341">"30 сек."</item>
-    <item msgid="3538441365970038213">"1 мин."</item>
-    <item msgid="412343871668955639">"2 мин."</item>
-    <item msgid="5076853889688991690">"5 мин."</item>
-    <item msgid="1903860996174927898">"10 мин."</item>
-    <item msgid="6415509612413178727">"30 мин."</item>
+    <item msgid="2194151041885903260">"15 секунд"</item>
+    <item msgid="5892295237131074341">"30 секунд"</item>
+    <item msgid="3538441365970038213">"1 минута"</item>
+    <item msgid="412343871668955639">"2 минуты"</item>
+    <item msgid="5076853889688991690">"5 минут"</item>
+    <item msgid="1903860996174927898">"10 минут"</item>
+    <item msgid="6415509612413178727">"30 минут"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Сразу"</item>
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Съемная SD-карта"</item>
     <item msgid="4498124044785815005">"На усмотрение системы"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Выключить"</item>
-    <item msgid="4804571292609523335">"Вибросигнал"</item>
-    <item msgid="595707141547423573">"Без звука"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Всегда"</item>
+    <item msgid="6293147072807231256">"Никогда"</item>
+    <item msgid="1276641209451816572">"Только в режиме без звука"</item>
+    <item msgid="8418930333779132418">"Только не в режиме без звука"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9c0afa8..5ca5fd9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ОК"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Введено недействительное имя хоста."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Список исключений отформатирован неверно. Перечислите исключаемые домены через запятую."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Необходимо заполнить поле порта."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Укажите порт."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Если поле хоста не заполнено, поле порта также следует оставить пустым."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Указанный порт недействителен."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прокси-сервер HTTP используется браузером, но недоступен для других приложений."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Запрос числового PIN-кода или пароля для дешифрования при каждом включении планшетного ПК"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Запрос числового PIN-кода или пароля для дешифрования при каждом включении телефона"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Функция шифрования доступна для аккаунтов, настроек, загруженных приложений и их данных, а также для мультимедийных и прочих файлов. После шифрования данных планшетного ПК при каждом его включении необходимо будет вводить числовой PIN-код или пароль для дешифрования. Единственный способ отключить шифрование – сброс настроек, в результате которого все данные будут потеряны."\n\n"Шифрование занимает не менее часа. Перед его запуском необходимо подключить зарядное устройство и не отключать его до завершения операции. В случае ее прерывания данные будут потеряны полностью или частично."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Шифрование доступно для аккаунтов, настроек, загруженных приложений и их данных, а также для мультимедийных и прочих файлов. После шифрования данных телефона при каждом его включении необходимо будет вводить числовой PIN-код или пароль, чтобы выполнить дешифрование данных. Единственный способ отключить шифрование – сброс настроек, в результате которого все данные будут потеряны."\n\n"Шифрование займет не менее одного часа. Перед его запуском необходимо подключить зарядное устройство и не отключать его до окончания операции. В случае прерывания шифрования будут потеряны все данные или часть из них."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После шифрования потребуется вводить PIN-код или пароль при каждом включении устройства. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные."\n\n"Шифрование занимает не менее часа. Аккумулятор должен быть полностью заряжен, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать шифрование, данные на устройстве будут потеряны полностью или частично."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После шифрования потребуется вводить PIN-код или пароль при каждом включении устройства. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные."\n\n"Шифрование занимает не менее часа. Аккумулятор должен быть полностью заряжен, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать шифрование, данные на устройстве будут потеряны полностью или частично."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Зашифровать планшет"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Зашифровать телефон"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядите батарею и повторите попытку."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Подключите зарядное устройство и повторите попытку."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Не указан PIN-код или пароль блокировки экрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Перед шифрованием необходимо задать PIN-код или пароль блокировки экрана."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Перед шифрованием необходимо задать PIN-код или пароль блокировки экрана."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Подтвердить шифрование"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Выполнить шифрование данных планшетного ПК? Эта операция необратима, и в случае ее прерывания данные будут потеряны. Шифрование займет не менее одного часа. Во время шифрования устройство будет перезагружено несколько раз."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Выполнить шифрование данных телефона? Эта операция необратима, и в случае ее прерывания данные будут потеряны. Шифрование займет не менее одного часа. Во время шифрования устройство будет перезагружено несколько раз."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Повторите попытку через <xliff:g id="DELAY">^1</xliff:g> с."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введите пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Сбой шифрования"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Данные на вашем планшетном ПК больше недоступны из-за прерванного шифрования."\n\n"Чтобы продолжить использовать устройства, выполните сброс до заводских настроек. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Данные на вашем телефоне больше недоступны из-за прерванного шифрования."\n\n"Чтобы продолжить использовать устройство, выполните сброс до заводских настроек. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Данные на вашем планшетном ПК больше недоступны из-за того, что шифрование было прервано. "\n\n"Чтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Данные на вашем телефоне больше недоступны из-за того, что шифрование было прервано. "\n\n"Чтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Тип блокировки"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Доп. способ блокировки"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокировка экрана"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Нет"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Перетащить значок блокировки"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Фейсконтроль"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Защита графическим ключом"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Защита PIN-кодом"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Защита паролем"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Графический ключ"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-код"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Пароль"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Отключить блокировку экрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Удалить графический ключ разблокировки"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Удалить ПИН-код разблокировки"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Звуковые эффекты"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Громкость звонка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Виброзвонок без звука"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Вибросигнал и рингтон"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Виброзвонок"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Уведомление по умолчанию"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Мигание трекбола"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Телефон не подключен к док-станции"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Настройки подключенной док-станции"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Док-станция не найдена."</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Чтобы настроить док-станцию, установите в нее планшетный ПК."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Чтобы настроить док-станцию, установите в нее телефон."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Чтобы настроить док-станцию, установите в нее планшетный ПК."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Чтобы настроить док-станцию, установите в нее телефон."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Звук при установке в док-станцию"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Воспроизводить звук при установке или извлечении планшетного ПК из док-станции"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Воспроизводить звук при установке или извлечении телефона"</string>
@@ -645,15 +645,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Обои"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Установка обоев"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Заставка"</string>
+    <string name="screensaver_settings_title" msgid="3848608373818910549">"Экранные заставки"</string>
     <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Активация в спящем режиме при зарядке"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Выключено"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Заставка"</string>
+    <string name="screensaver_component_title" msgid="8596216100441725363">"Выбранная заставка"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Время до активации"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Выкл."</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Попробовать"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Вкл. в док-станции"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"Пробный запуск"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Активировать при подключении к док-станции"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Размер шрифта"</string>
@@ -808,8 +808,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Возврат к заводским настройкам и удаление всех данных из памяти планшетного ПК"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:"\n\n<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:"\n\n<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все сведения из "<b>"внутреннего хранилища"</b>" устройства, в том числе:"\n\n<li>"ваш аккаунт Google;"</li>\n<li>"все данные и настройки (системы и приложений);"</li>\n<li>"загруженные приложения."</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все сведения из "<b>"внутреннего хранилища"</b>" устройства, в том числе:"\n\n<li>"ваш аккаунт Google;"</li>\n<li>"все данные и настройки (системы и приложений);"</li>\n<li>"загруженные приложения."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"В настоящее время вы выполнили вход в следующие аккаунты:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Удалить всю личную информацию и загруженные приложения без возможности восстановления?"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Стереть все"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертить графический ключ"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Для подтверждения сброса настроек необходимо начертить графический ключ."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Чтобы подтвердить сброс настроек, начертите графический ключ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Сброс не выполнен, поскольку служба System Clear недоступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Выполнить сброс?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистить USB-накопитель"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Удалить с SD-карты все файлы без возможности восстановления?"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Стереть все"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Начертить графический ключ разблокировки"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Для подтверждения очистки USB-накопителя начертите графический ключ."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Для подтверждения очистки SD-карты начертите графический ключ."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Чтобы подтвердить очистку USB-накопителя, начертите графический ключ."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Чтобы подтвердить очистку SD-карты, начертите графический ключ."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Вызовы"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-модем"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Далее"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Безопасность планшетного ПК"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Обеспечение безопасности телефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетом. Для этого соедините в произвольном порядке не менее четырех точек на экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетным ПК. Для этого соедините в произвольном порядке не менее четырех точек на экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Чтобы никто, кроме вас, не мог воспользоваться вашим телефоном, создайте графический ключ разблокировки экрана. Для этого соедините в произвольном порядке не менее четырех точек на следующем экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление приложениями"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление установленными приложениями и их удаление"</string>
@@ -961,9 +961,9 @@
     <string name="force_stop" msgid="7435006169872876756">"Остановить"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Всего"</string>
     <string name="application_size_label" msgid="8494609207373874267">"Приложение"</string>
-    <string name="external_code_size_label" msgid="3459343140355961335">"на USB-накопителе"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Приложение USB-накопителя"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Данные"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"на USB-накопителе"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Данные USB-накопителя"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Удалить"</string>
     <string name="disable_text" msgid="6544054052049395202">"Отключить"</string>
@@ -1122,7 +1122,7 @@
     <string name="input_method_settings" msgid="5801295625486269553">"Настройки"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Настройки"</string>
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"Активные способы ввода"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Язык системы"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Использовать язык системы"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Настройки <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Выберите активные способы ввода"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Настройки экранной клавиатуры"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Большой текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка питания завершает вызов"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Озвучивать пароли"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Изучение касанием"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Функция \"Изучение касанием\" позволяет прослушивать или просматривать описание элементов, которых вы касаетесь."\n\n" Эта функция предназначена для пользователей с нарушением зрения."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Задержка при нажатии и удержании"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Службы не установлены"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Нужна программа чтения с экрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Бесплатное приложение TalkBack дает голосовое описание элементов интерфейса для пользователей с нарушением зрения. Установить его из Android Маркета?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Установить веб-скрипты?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Разрешить приложениям устанавливать скрипты Google для повышения доступности веб-контента?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Эта функция меняет способ сенсорной навигации устройства. Включить?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Нет описания"</string>
@@ -1206,7 +1204,7 @@
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Подробная история"</string>
     <string name="details_title" msgid="3792801565213935385">"Расход батареи"</string>
-    <string name="details_subtitle" msgid="32593908269911734">"Расход батареи"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Сведения об использовании"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Режим энергопотребления"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Вложенные пакеты"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
@@ -1218,7 +1216,7 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – активный режим"</string>
-    <string name="usage_type_wake_lock" msgid="5125438890233677880">"Активный режим"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"Не отключать"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшетный ПК"</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Хранилище регистрационных данных очищено."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Не удалось очистить хранилище."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилище регистрационных данных включено."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Прежде чем использовать хранилище учетных данных, необходимо задать PIN-код или пароль для блокировки экрана."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Перед использованием хранилища учетных данных необходимо задать PIN-код или пароль блокировки экрана."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Восстановление и сброс"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Общий ключ IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Сертификат пользователя IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Сертификат ЦС IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Сертификат сервера IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Дополнительно"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Домены для поиска DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-серверы (например, 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Сохранить учетные данные"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(не используется)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(не проверять сервер)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(получено с сервера)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Отмена"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Сохранить"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Подключиться"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Завершить"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Пропустить руководство"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1. Навигация по экрану"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Функция \"Изучение касанием\" позволяет узнавать, к чему вы прикоснулись на экране. Например, сейчас отображаются значки приложений. Попробуйте найти их на ощупь."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Функция \"Изучение касанием\" позволяет узнавать, к чему вы прикоснулись на экране. Например, сейчас отображаются значки приложений. Попробуйте найти их на ощупь."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Хорошо. Проведите пальцем по экрану, пока не найдете по крайней мере еще один значок."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Чтобы активировать элемент, нажмите на него. Перелистывайте экран, пока не найдете значок <xliff:g id="APP_NAME">%s</xliff:g>. Затем нажмите на него один раз для активации."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ваш палец находится на значке <xliff:g id="APP_NAME">%s</xliff:g>. Для активации коснитесь его один раз."</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 78b4862..34a63d8 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Odnímateľná karta SD"</item>
     <item msgid="4498124044785815005">"Automaticky vyberie systém"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Vypnúť"</item>
-    <item msgid="4804571292609523335">"Vibrovať"</item>
-    <item msgid="595707141547423573">"Vypnúť zvuk"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Vždy"</item>
+    <item msgid="6293147072807231256">"Nikdy"</item>
+    <item msgid="1276641209451816572">"Iba v tichom režime"</item>
+    <item msgid="8418930333779132418">"Iba ak nie je v tichom režime"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátky"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 701575e..b1c9d2e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Zadaný názov hostiteľa nie je platný."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Zoznam vylúčení, ktorý ste vytvorili, má nesprávny formát. Zadajte zoznam vylúčených domén a jednotlivé názvy oddeľte čiarkami."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Treba vyplniť pole port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Musíte vyplniť pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ak je pole hostiteľ prázdne, musí byť prázdne aj pole port."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Zadaný port nie je platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Prehliadač používa server proxy pre protokol HTTP, ale ostatné aplikácie ho používať nemusia."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Pri každom zapnutí tabletu požadovať číslo PIN alebo heslo na jeho dešifrovanie"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Pri každom zapnutí telefónu požadovať číslo PIN alebo heslo na jeho dešifrovanie"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrované"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Môžete zašifrovať svoje účty, nastavenia, prevzaté aplikácie a ich údaje, médiá a ďalšie súbory. Po zašifrovaní tabletu ho budete musieť pri každom zapnutí dešifrovať zadaním čísla PIN alebo hesla. Toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa vymažú všetky údaje na tablete."\n\n"Šifrovanie môže trvať až hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, prídete o niektoré alebo o všetky údaje."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje, médiá a ďalšie súbory môžete zašifrovať. Po zašifrovaní telefónu ho budete musieť pri každom zapnutí dešifrovať zadaním čísla PIN alebo hesla. Toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa vymažú všetky údaje."\n\n"Šifrovanie môže trvať aj viac ako hodinu. V telefóne musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, prídete o niektoré alebo o všetky údaje."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú."\n\n"Šifrovanie môže trvať aj viac ako hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní telefónu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v telefóne vymažú."\n\n"Šifrovanie môže trvať aj viac ako hodinu. V telefóne musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovať tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovať telefón"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabite batériu a skúste to znova."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Zapojte nabíjačku a skúste to znova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Chýba heslo alebo číslo PIN na odomknutie obrazovky"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Pred spustením šifrovania musíte nastaviť heslo alebo číslo PIN na zamknutie obrazovky."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Pred spustením šifrovania musíte nastaviť heslo alebo kód PIN uzamknutia obrazovky."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrdiť šifrovanie"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Chcete tablet zašifrovať? Táto operácia je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Tablet sa počas tejto doby niekoľkokrát reštartuje."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Chcete telefón zašifrovať? Táto operácia je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Počas tejto doby sa telefón niekoľkokrát reštartuje."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadajte svoje heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrovanie bolo neúspešné"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Šifrovanie bolo prerušené a nie je možné ho dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj tablet, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifrovanie bolo prerušené a nie je možné ho dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj telefón, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj tablet, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré sa zálohovali do vášho účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj telefón, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Vyberte uzam. obrazov."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vybrať zámku zálohy"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Uzamknutie obrazovky"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Žiadne"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Posunutie"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Odomknutie tvárou"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečené vzorom"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zabezpečené pomocou kódu PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Zabezpečené heslom"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Vzor"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Heslo"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Vypnúť zámku obrazovky"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrániť bezpečnostný vzor"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrániť bezpečnostný kód PIN"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Hudobné efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitosť vyzváňania"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrovať a vyzváňať"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrovať"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Predvolené upozornenie"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikať kontrolkou upozornenia"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváňací tón"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefón nie je vložený do doku"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Nastavenia pripojeného doku"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok nebol nájdený"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Pred nastavením zvuku doku v ňom musí byť vložený tablet."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Pred nastavením zvuku doku v ňom musí byť vložený telefón."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Pred nastavením zvuku doku v ňom musí byť vložený tablet."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Pred nastavením zvuku doku v ňom musí byť vložený telefón."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Zvuk pri vkladaní do doku"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Prehrať zvuk pri vkladaní alebo odstraňovaní tabletu z doku"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Prehrať zvuk pri vkladaní alebo odstraňovaní telefónu z doku"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vymazať všetky vaše osobné údaje a prevzaté aplikácie? Túto akciu nebude možné vrátiť späť."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vymazať všetko"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Nakreslite bezpečnostný vzor"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Ak chcete potvrdiť obnovenie továrenských nastavení, musíte nakresliť bezpečnostný vzor."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Obnovenie továrenských nastavení musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Pokus o obnovenie sa neuskutočnil, pretože služba System Clear nie je k dispozícii."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Obnoviť?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vymazať ukladací priestor USB"</string>
@@ -838,11 +838,11 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Chcete kartu SD vymazať a odstrániť tak všetky súbory, ktoré sú na nej uložené? Túto akciu nebude možné vrátiť späť."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstrániť všetko"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Nakreslite bezpečnostný vzor"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Vymazanie ukladacieho priestoru USB treba potvrdiť pomocou bezpečnostného vzoru."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Vymazanie karty SD musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vymazanie úložiska USB musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Vymazanie karty SD musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavenia hovorov"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavenie hlasovej schránky, presmerovania hovorov, čakajúcich hovorov a identifikácie volajúceho"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering cez USB"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Pripojenie cez USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosný prístupový bod"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Pripojenie cez Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Zdieľanie dát. pripojenia"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Ďalej"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpečenie vášho tabletu"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpečenie telefónu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Chráňte svoj tablet pred neoprávneným použitím vytvorením osobného vzoru na odomknutie obrazovky. Na ďalšej obrazovke pospájajte prstom body v ľubovoľnom poradí. Musíte spojiť aspoň štyri body. "\n\n"Ak ste pripravený/-á začať, dotknite sa tlačidla Ďalej."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Chráňte svoj tablet pred neoprávneným použitím vytvorením osobného vzoru na odomknutie obrazovky. Na ďalšej obrazovke pospájajte prstom body v ľubovoľnom poradí. Musíte spojiť aspoň štyri body. "\n\n"Ak chcete začať, dotknite sa tlačidla Ďalej."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Svoj telefón môžete chrániť pred neautorizovaným použitím pomocou osobného bezpečnostného vzoru obrazovky. Bodky na nasledujúcej obrazovke spojte prejdením prstom v akomkoľvek poradí. Spojiť treba aspoň štyri bodky. "\n\n"Keď chcete začať, dotknite sa tlačidla „Ďalej“."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovať aplikácie"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veľké písmo"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tlačidlo Napájanie ukončuje hovor"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Hovorené heslá"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explore by touch"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Keď je funkcia Explore by Touch zapnutá, môžete vidieť alebo počuť popisy položiek, ktorých sa dotýkate. "\n" "\n"Táto funkcia je určená pre používateľov s poruchou zraku."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Oneskorenie dotyku a podržania"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nie sú nainštalované žiadne služby"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrebujete čítačku obrazovky?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Aplikácia Talkback poskytuje hovorenú odozvu na pomoc nevidomým a slabozrakým používateľom. Chcete si túto aplikáciu bezplatne nainštalovať zo služby Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Nainštalovať webové skripty?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Chcete, aby aplikácie prevzali zo služby Google skripty, ktoré uľahčia prístup k ich obsahu?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Táto funkcia mení spôsob, akým zariadenie reaguje na dotyk. Chcete ju zapnúť?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozícii nie je žiadny popis."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Ukl. priestor pover. je vymaz."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Úložisko poverení nemožno vym."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Ukladací priestor poverení je aktivovaný."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Pred použitím úložiska poverení musíte nastaviť kód PIN alebo heslo uzamknutia obrazovky."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Pred použitím úložiska poverení musíte nastaviť heslo alebo kód PIN uzamknutia obrazovky."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tiesňové vyzváňanie"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastaviť správanie pri tiesňovom volaní"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Zálohovať a obnoviť"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Predzdieľaný kľúč protokolu IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Používateľský certifikát protokolu IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certifikát CA protokolu IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certifikát servera IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Zobraziť rozšírené možnosti"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Vyhľadávacie domény DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servery DNS (napr. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Uložiť informácie o účte"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(nepoužité)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(neoverovať server)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(prijatý zo servera)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Zrušiť"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Uložiť"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Pripojiť"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Dokončiť"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Preskočiť kurz"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekcia 1: Prieskum obrazovky"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Po zapnutí funkcie „Preskúmavanie dotykom“ môžete dotykom na obrazovku zistiť, čo je pod vaším prstom. Príklad: aktuálna obrazovka obsahuje ikony aplikácií. Nájdite jednu z nich dotknutím sa obrazovky a posúvaním prsta dookola."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Po zapnutí funkcie „Preskúmanie dotykom“ môžete tým, že sa dotknete obrazovky, zistiť, čo sa nachádza pod vaším prstom. Príklad: aktuálna obrazovka obsahuje ikony aplikácií. Dotknite sa obrazovky a posúvajte prstom, dokým niektorú z nich nenájdete."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobre. Posúvajte prstom po obrazovke, kým nenájdete aspoň jednu ďalšiu ikonu."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Ak chcete aktivovať položku, ktorej sa dotýkate, klepnite na ňu. Posúvajte prstom, kým nenájdete ikonu aplikácie <xliff:g id="APP_NAME">%s</xliff:g>. Následne ju aktivujte jedným klepnutím."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Váš prst sa dotýka ikony <xliff:g id="APP_NAME">%s</xliff:g>. Aktivujete ju jedným klepnutím."</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 4927685..6f51ab0 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Izmenljiva kartica SD"</item>
     <item msgid="4498124044785815005">"Naj odloči sistem"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Izklopljeno"</item>
-    <item msgid="4804571292609523335">"Vibriranje"</item>
-    <item msgid="595707141547423573">"Izklopi zvok"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Vedno"</item>
+    <item msgid="6293147072807231256">"Nikoli"</item>
+    <item msgid="1276641209451816572">"Samo v tihem načinu"</item>
+    <item msgid="8418930333779132418">"Samo, kadar telefon ni v tihem načinu"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5892176..b98725c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"V redu"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Ime gostitelja, ki ste ga vtipkali, ni veljavno."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Seznam izključitev, ki ste ga vnesli, ni pravilno oblikovan. Domene na seznamu morajo biti ločene z vejico."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Izpolniti morate polje za vrata."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Izpolniti morate polje vrat."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Če je polje za gostitelja prazno, mora biti prazno tudi polje za vrata."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Vtipkana številka vrat je neveljavna."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali tablični računalnik"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali telefon"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatke, predstavnostne in druge datoteke. Ko tablični računalnik šifrirate, ga morate ob vsakem vklopu dešifrirati, tako da vnesete kodo PIN ali geslo: tabličnega računalnika ne morete razšifrirati drugače, kot da ga ponastavite na tovarniške nastavitve, s čimer izbrišete vse svoje podatke."\n\n"Šifriranje traja uro ali več. Preden začnete, morate napolniti baterijo, med šifriranjem pa naj bo tablični računalnik priključen na napajanje. Če prekinete postopek šifriranja, boste izgubili del podatkov ali vse."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatke, predstavnostne in druge datoteke. Ko telefon šifrirate, ga morate ob vsakem vklopu dešifrirati, tako da vnesete kodo PIN ali geslo: telefona ne morete razšifrirati drugače, kot da ga ponastavite na tovarniške nastavitve, s čimer izbrišete vse svoje podatke."\n\n"Šifriranje traja uro ali več. Preden začnete, morate napolniti baterijo, med šifriranjem pa naj bo telefon priključen na napajanje. Če prekinete postopek šifriranja, boste izgubili del podatkov ali vse."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate tablični računalnik, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke."\n\n"Šifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, računalnik pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate telefon, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke."\n\n"Šifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, telefon pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifriraj tablični računalnik"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifriraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napolnite baterijo in poskusite znova."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Priključite polnilnik in poskusite znova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ni kode PIN ali gesla za zaklepanje zaslona"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Pred začetkom šifriranja morate nastaviti PIN ali geslo za zaklepanje zaslona."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Preden lahko začnete s šifriranjem, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potrdite šifriranje"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Ali želite šifrirati tablični računalnik? Tega dejanja ne morete razveljaviti ali prekiniti, ker lahko pride do izgube podatkov. Šifriranje traja eno uro ali več in v tem času se bo tablični računalnik večkrat znova zagnal."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Ali želite šifrirati telefon? Tega dejanja ne morete razveljaviti ali prekiniti, ker lahko pride do izgube podatkov. Šifriranje traja uro ali več in v tem času se bo telefon večkrat vnovič zagnal."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Poskusite znova čez <xliff:g id="DELAY">^1</xliff:g> sekund."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Vnesite geslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifriranje ni uspelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. "\n\n"Če želite tablični računalnik spet uporabljati, morate ponastaviti tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. "\n\n"Če želite telefon spet uporabljati, morate ponastaviti tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. "\n\n"Če želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. "\n\n"Če želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Izberite zakl. zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Izberite varnostno zaklepanje"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaklepanje zaslona"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Pomik"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Odklepanje z obrazom"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zaščiten z vzorcem"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zaščiteno s kodo PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Zaščiteno z geslom"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Vzorec"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Koda PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Geslo"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Izklopi zaklepanje zaslona"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrani vzorec za odklepanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrani kodo PIN za odklepanje"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Glasbeni učinki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnost zvonjenja"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj v tihem načinu"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibriranje in zvonjenje"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibriranje"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Privzeto obvestilo"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Lučka za obvestila z utripanjem"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvonjenje"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon ni nameščen v stojalu"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Nastavitve za priklopljeno stojalo"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Stojala ni mogoče najti"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Če želite nastaviti zvok, mora biti telefon v stojalu."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Če želite nastaviti zvok telefona, mora biti telefon v stojalu."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Preden nastavite zvok, mora biti tablični računalnik v stojalu."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Preden nastavite zvok, mora biti telefon v stojalu."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Zvok ob vstavitvi v stojalo"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Predvajaj zvok med vstavljanjem tabličnega računalnika v stojalo ali odstranjevanjem iz njega"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Predvajaj zvok pri vstavitvi telefona v stojalo ali odstranitvi iz njega"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Želite izbrisati vse osebne podatke in prenesene programe? Tega dejanja ni mogoče razveljaviti."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši vse"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Narišite vzorec za odklepanje"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Narisati morate vzorec za odklepanje, če želite potrditi ponastavitev tovarniških podatkov."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Ponastavitev ni opravljena, ker storitev System Clear ni na voljo."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Želite ponastaviti?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Izbriši pomnilnik USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ali želite izbrisati vse datoteke, shranjene na kartici SD? Dejanja ni mogoče razveljaviti."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Izbriši vse"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Narišite vzorec za odklepanje"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Če želite potrditi brisanje pomnilnika USB, morate narisati vzorec za odklepanje."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Narisati morate vzorec za odklepanje, če želite potrditi izbris kartice SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Če želite potrditi brisanje pomnilnika USB, morate narisati vzorec za odklepanje."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Če želite potrditi brisanje kartice SD, morate narisati vzorec za odklepanje."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Klicne nastavitve"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavite telefonski predal, preusmeritev klicev, čakajoči klic, ID klicatelja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internet prek USB-ja"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Naprej"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Varnost tabličnega računalnika"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zaščita telefona"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Zaščitite tablični računalnik pred nepooblaščeno uporabo tako, da ustvarite vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite pike. Povezati morate vsaj štiri pike. "\n\n"Ste pripravljeni? Dotaknite se možnosti »Naprej«."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Zaščitite tablični računalnik pred nepooblaščeno uporabo tako, da ustvarite vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite pike. Povezati morate vsaj štiri pike. "\n\n"Ste pripravljeni? Dotaknite se možnosti »Naprej«."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Zaščitite telefon pred nepooblaščeno uporabo, tako da ustvarite osebni vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite vsaj štiri pike. "\n\n"Ste pripravljeni? Dotaknite se gumba »Naprej«."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljaj programe"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje in odstranjevanje nameščenih programov"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veliko besedilo"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Gumb za vklop konča klic"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Izgovorite gesla"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Raziskovanje z dotikom"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Če je vklopljeno raziskovanje z dotikom, lahko slišite ali vidite opise vsebine pod prstom."\n\n" Ta funkcija je namenjena uporabnikom, ki slabo vidijo."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Zapoznitev za dotik in pridržanje"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nameščena ni nobena storitev"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrebujete bralnik zaslona?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Program TalkBack daje izgovorjene povratne informacije za pomoč slepim in slabovidnim uporabnikom. Ali ga želite brezplačno namestiti iz trgovine Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Želite namestiti spletne skripte?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ali želite, da programi namestijo skripte iz Googla, ki omogočajo širšo dostopnost njihove spletne vsebine?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ta funkcija spremeni način, na katerega se naprava odziva na dotik. Jo želite vklopiti?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ni opisa."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Shramba poverilnic je izbrisana."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Shrambe pover. ni mogoče izbr."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Shramba poverilnic je omogočena."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Pred uporabo shrambe poverilnic morate nastaviti PIN ali geslo za zaklepanje zaslona."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Preden lahko uporabite shrambo poverilnic, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton v sili"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavi način delovanja ob klicanju v sili"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Izdelaj varnostno kopijo in ponastavi"</string>
@@ -1342,7 +1340,7 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Samodejna obnovitev"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri vnovični namestitvi programa obnovite varnostno kopirane nastavitve in podatke"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Popolne varnostne kopije podatkov v računalniku trenutno niso zaščitene."</string>
+    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Popolne varnostne kopije podatkov v računalniku trenutno niso podprte."</string>
     <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Izberite, če želite spremeniti ali odstraniti geslo za popolno varnostno kopiranje podatkov v računalniku"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Ali želite ustaviti varnostno kopiranje gesel za Wi-Fi, zaznamkov, drugih nastavitev in podatkov programov ter izbrisati vse kopije v Googlovih strežnikih?"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Ključ v predhodni skupni rabi IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Uporabniško potrdilo IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Overjeno potrdilo IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Potrdilo strežnika IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Prikaži dodatne možnosti"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domene za iskanje DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Strežniki DNS (npr. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Shrani podatke o računu"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ni uporabljeno)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ne preveri strežnika)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(prejeto iz strežnika)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Prekliči"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Shrani"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Vzpostavi povezavo"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Dokončaj"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Preskoči vadnico"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. vaja: Raziskovanje zaslona"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Ko vklopite »Raziskovanje z dotikom«, lahko z dotikanjem zaslona ugotavljate, kaj je pod vašim prstom. Trenutni zaslon na primer vsebuje ikone programov. Poiščite eno med njimi z dotikanjem zaslona in drsenjem prsta po njem."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Če vklopite funkcijo raziskovanja z dotikom, se lahko dotaknete zaslona, da izveste, kaj je pod prstom. Na trenutnem zaslonu so na primer prikazane ikone programov. Poiščite eno med njimi, tako da se dotaknete zaslona in premaknete prst."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Odlično. Prst še naprej pomikajte po zaslonu, dokler ne najdete vsaj še ene ikone."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Če želite aktivirati program, ki se ga dotikate, ga tapnite. Pomikajte prst, dokler ne najdete ikone za <xliff:g id="APP_NAME">%s</xliff:g>. Nato ikono enkrat tapnite, da ga aktivirate."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Vaš prst se dotika ikone <xliff:g id="APP_NAME">%s</xliff:g>. Tapnite enkrat, da aktivirate ikono."</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index af91986..1d80f3e 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Уклоњива SD картица"</item>
     <item msgid="4498124044785815005">"Нека систем одлучи"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Искључено"</item>
-    <item msgid="4804571292609523335">"Вибрирај"</item>
-    <item msgid="595707141547423573">"Искључи звук"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Увек"</item>
+    <item msgid="6293147072807231256">"Никад"</item>
+    <item msgid="1276641209451816572">"Само у нечујном режиму"</item>
+    <item msgid="8418930333779132418">"Само када није у нечујном режиму"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3fa32e5..a836ee1 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Потврди"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Име хоста које сте унели није важеће."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Листа изузимања коју сте унели није исправно обликована. Унесите листу раздвојену зарезима која садржи изузете домене."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Потребно је да попуните поље порта."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Треба да попуните поље порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поље за порт мора да буде празно ако је поље за назив хоста празно."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Унели сте неважећи порт."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прегледач користи HTTP прокси, али друге апликације не могу да га користе."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Захтева нумерички PIN или лозинку за дешифровање таблета сваки пут када га укључите"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Захтева нумерички PIN или лозинку за дешифровање телефона сваки пут када га укључите"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите: Не можете да опозовете шифровање таблета осим уколико не вратите фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје један сат или дуже. Потребно је да батерија на почетку буде напуњена и да таблет буде укључен док не завршите шифровање. Уколико прекинете процес шифровања, изгубићете све податке или део њих."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете телефон, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите: не можете да опозовете шифровање телефона осим уколико не вратите фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје један сат или дуже. Потребно је да батерија на почетку буде напуњена и да телефон буде укључен док не завршите шифровање. Уколико прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не вратите на фабричка подешавања, чиме ћете избрисати све податке."\n\n"Шифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали телефон, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите: не можете да дешифрујете телефон осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете телефон док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифруј таблет"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифруј телефон"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Напуните батерију и покушајте поново."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Укључите пуњач и покушајте поново."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Нема PIN-а или лозинке за закључавање екрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Потребно је да подесите PIN или лозинку за закључавање екрана да бисте могли да почнете са шифровањем."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Потребно је да подесите PIN или лозинку за закључавање екрана да бисте могли да започнете шифровање."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Потврда шифровања"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Желите ли да шифрујете таблет? Та операција је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду таблет ће се поново покренути неколико пута."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Желите ли да шифрујете телефон? Та операција је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду телефон ће се поново покренути неколико пута."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Унесите лозинку"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифровање није успело"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. "\n\n" Да бисте наставили да користите таблет, морате да обавите враћање на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. "\n\n"Да бисте наставили да користите телефон, морате да обавите враћање на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. "\n\n" Да бисте наставили да користите таблет, потребно је да га вратите на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. "\n\n"Да бисте наставили да користите телефон, потребно је да га вратите на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Избор закључав. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Закључавање рез. коп."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Закључавање екрана"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ништа"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Превлачење"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Откључавање лицем"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Обезбеђено помоћу шаблона"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Обезбеђено помоћу PIN-а"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Обезбеђено помоћу лозинке"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Шаблон"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Лозинка"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Искључивање закључавања екрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Уклањање шаблона за откључавање"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Уклањање PIN кода за откључавање"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Музички ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Јачина звука звона"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрација у нечујном режиму"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Вибрирај и звони"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Вибрација"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Подразумевано обавештење"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Лампица за обавештења која трепери"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Звук звона"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Телефон није причвршћен"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Подешавања за прикључено постоље"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Постоље није пронађено"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Потребно је да поставите таблет на базну станицу пре него што подесите звук базне станице."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Потребно је да поставите телефон на базну станицу пре него што подесите звук базне станице."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Треба да поставите таблет на базну станицу пре него што подесите звук базне станице."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Потребно је да поставите телефон на базну станицу пре него што подесите звук базне станице."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Звук уметања базне станице"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Репродукуј звук приликом постављања таблета на базну станицу или уклањања са ње"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Пуштање звука када се телефон ставља на постоље или уклања са њега"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Желите ли да избришете све личне информације и преузете апликације? Не можете да опозовете ову радњу!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши све"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Нацртајте шаблон за откључавање"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Морате да нацртате шаблон за откључавање да бисте потврдили враћање фабричких података."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Треба да нацртате шаблон за откључавање да бисте потврдили враћање фабричких података."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Није обављено враћање на почетне вредности зато што услуга брисања система није доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Враћање на почетне вредности?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Брисање USB меморије"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Желите ли да избришете SD картицу, бришући на тај начин све датотеке ускладиштене на њој? Не можете да опозовете ту радњу!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Избриши све"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Нацртајте шаблон за откључавање"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Морате да нацртате шаблон за откључавање да бисте потврдили да желите да обришете USB меморију."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Мораћете да нацртате шаблон за откључавање да бисте потврдили да желите да обришете SD картицу."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Потребно је да нацртате шаблон за откључавање да бисте потврдили да желите да избришете USB меморију."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Треба да нацртате шаблон за откључавање да бисте потврдили да желите да избришете SD картицу."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Подешавања позива"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Подешавање гласовне поште, преусмеравања позива, стављања позива на чекање, ИД-а позиваоца"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB Интернет повезивање"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Следеће"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Обезбеђивање таблета"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Обезбеђивање телефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите тачке прстом било којим редоследом. Морате да повежете најмање четири тачке. "\n\n"Да ли сте спремни да почнете? Додирните Следеће."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану превлачите прстом да бисте повезали тачке било којим редоследом. Потребно је да повежете најмање четири тачке. "\n\n"Да ли сте спремни да почнете? Додирните Даље."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Заштитите телефон од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите прстом најмање четири тачке било којим редоследом. "\n\n"Спремни сте да почнете? Додирните Следеће."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управљај апликацијама"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управљање инсталираним апликацијама и њихово уклањање"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Систем"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Велики текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Дугме за напајање прекида позив"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Изговорите лозинке"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Истраживање додиром"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Када је укључена функција Истражи додиром, чућете или видети описе ставки које вам се налазе испод прста."\n\n" Ова функција је намењена слабовидим корисницима."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Одлагање притискa и задржавањa"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ниједна услуга није инсталирана"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Потребан вам је читач екрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack пружа говорне повратне информације како би помогао слепим корисницима и корисницима са слабим видом. Да ли желите да га бесплатно инсталирате са Android Market-а?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Желите ли да инсталирате веб скрипте?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Да ли желите да апликације инсталирају скрипте из Google-а помоћу којих ће њихов веб садржај постати приступачнији?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ова функција мења начин на који уређај реагује на додир. Желите ли да је укључите?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Није наведен опис."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Складиште акред. је избрисано."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Није могуће oбрисати складиште акредитива."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Складиште акредитива је омогућено."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Морате да подесите PIN или лозинку за закључавање екрана да бисте могли да користите складиште акредитива."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Треба да подесите PIN или лозинку за закључавање екрана да бисте могли да користите складиште акредитива."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитни позив"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Прављење резервне копије и враћање на почетне вредности"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec унапред дељени кључ"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec сертификат корисника"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA сертификат"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec сертификат сервера"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Прикажи напредне опције"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS домени за претрагу"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS сервери (нпр. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Сачувај информације о налогу"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(не користи се)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(не верификуј сервер)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(примљено са сервера)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Откажи"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Сачувај"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Повежи"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Заврши"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Прескочи водич"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. лекција: Истраживање екрана"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Након што укључите Истраживање додиром, можете да додирнете екран да бисте сазнали на шта сте ставили прст. На пример, тренутни екран садржи иконе апликација. Пронађите неку од њих тако што ћете додирнути екран и превлачити прст наоколо."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Када је Истраживање додиром укључено, можете да додирнете екран да бисте сазнали на шта сте ставили прст. На пример, тренутни екран садржи иконе апликација. Пронађите неку од њих тако што ћете додирнути екран и превлачити прст наоколо."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Одлично. Наставите да превлачите прстом по екрану док не нађете још најмање једну икону."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Да бисте активирали нешто преко чега прелазите прстима, додирните га. Превлачите прстом док не пронађете икону за <xliff:g id="APP_NAME">%s</xliff:g>. Затим додирните икону једанпут да бисте активирали апликацију."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Прст додирује икону апликације <xliff:g id="APP_NAME">%s</xliff:g>. Додирните једанпут икону да бисте је активирали."</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 82bf6d3..c507493 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Flyttbart SD-kort"</item>
     <item msgid="4498124044785815005">"Låt systemet bestämma"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Inaktiverat"</item>
-    <item msgid="4804571292609523335">"Vibrera"</item>
-    <item msgid="595707141547423573">"Ljud av"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Alltid"</item>
+    <item msgid="6293147072807231256">"Aldrig"</item>
+    <item msgid="1276641209451816572">"Bara i tyst läge"</item>
+    <item msgid="8418930333779132418">"Bara i tyst läge"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index aae4502..010aa27 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Värdnamnet som du har angett är inte giltigt."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Uteslutningslistan du angav är inte korrekt formaterad. Ange en kommaavgränsad lista över uteslutna domäner."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du måste fylla i portfältet."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Du måste fylla i portfältet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfältet måste vara tomt om värdfältet är tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Porten som du har angett är inte giltig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyn används av webbläsaren men får inte användas av de andra apparna."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ange PIN-kod eller lösenord för att dekryptera pekdatorn varje gång du slår på den"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ange PIN-kod eller lösenord för att dekryptera telefonen varje gång du slår på den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat pekdatorn måste du ange en PIN-kod eller ett lösenord varje gång du startar enheten för att den ska dekrypteras. Pekdatorn kan inte dekrypteras utan att standardinställningarna återställs, vilket innebär att alla data tas bort."\n\n"Krypteringen kan ta en timme eller mer. Se till att batteriet är laddat innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter krypteringen kan du förlora en del eller alla data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat mobilen måste du ange en PIN-kod eller ett lösenord varje gång du startar enheten för att den ska dekrypteras. Mobilen kan inte dekrypteras utan att standardinställningarna återställs, vilket innebär att alla data tas bort."\n\n"Krypteringen kan ta en timme eller mer. Se till att batteriet är laddat innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter krypteringen kan du förlora en del eller alla data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar pekdatorn måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar mobilen måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera pekdatorn"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kryptera telefonen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Ladda batteriet och försök igen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Anslut laddaren och försök igen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"PIN-kod eller lösenord saknas för skärmlåset"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset innan du påbörjar krypteringen."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset innan du påbörjar krypteringen."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekräfta kryptering"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vill du kryptera pekdatorn? Åtgärden kan inte ångras och om du avbryter den kan data försvinna. Krypteringen kan ta en timme eller mer och under tiden startas pekdatorn om flera gånger."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vill du kryptera telefonen? Åtgärden kan inte ångras och om du avbryter den kan data försvinna. Krypteringen kan ta en timme eller mer och under tiden startas telefonen om flera gånger."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Försök igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ange ditt lösenord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krypteringen misslyckades"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Krypteringen avbröts och kan inte slutföras. Data på pekdatorn är därför inte tillgängliga längre. "\n\n" Om du vill fortsätta använda pekdatorn måste du återställa standardinställningarna. När du konfigurerar pekdatorn efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Krypteringen avbröts och kan inte slutföras. Data på mobiltelefonen är därför inte tillgängliga längre. "\n\n"Om du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar telefonen efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen avbröts och kan inte slutföras. Data på pekdatorn är därför inte tillgängliga längre."\n\n" Om du vill fortsätta använda pekdatorn måste du återställa standardinställningarna. När du konfigurerar pekdatorn efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen avbröts och kan inte slutföras. Data på mobilen är därför inte tillgängliga längre."\n\n"Om du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar enheten efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Välj skärmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Välj lås för säkerhetskopiering"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skärmlås"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Inget"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Dra"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ansiktslås"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Skyddad med grafiskt lösenord"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Skyddad med PIN-kod"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Skyddad med lösenord"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Grafiskt lösenord"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kod"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Lösenord"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Inaktivera skärmlås"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ta bort grafiskt lösenord"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ta bort PIN-kod för upplåsning"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringvolym"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrera vid tyst"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrera och ring"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibrera"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standardmeddelande"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulserande ljusavisering"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringsignal"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen är inte dockad"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Inställningar för ansluten dockningsenhet"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Ingen dockningsenhet hittades"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Du måste docka pekdatorn innan du konfigurerar ljudet för dockning."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Du måste docka mobilen innan du konfigurerar ljudet för dockning."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du måste docka pekdatorn innan du konfigurerar ljudet för dockning."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Du måste docka mobilen innan du konfigurerar ljudet för dockning."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Ljud för placering i docka"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Spela upp ljud när pekdatorn placeras i eller tas bort från dockningsstation"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Spela upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vill du radera all personlig information och alla hämtade appar? Åtgärden kan inte ångras."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rita ditt grafiska lösenord"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Du måste rita ditt grafiska lösenord om du vill återställa pekdatorns standardinställningar."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du måste rita ditt grafiska lösenord om du vill återställa standardinställningarna."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vill du återställa?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Radera USB-lagring"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vill du radera SD-kortet och alla filer på kortet? Åtgärden kan inte ångras."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Radera allt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Rita ditt grafiska lösenord"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du måste rita ditt grafiska lösenord om du vill bekräfta formateringen av USB-lagringsenheten."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du måste rita ditt grafiska lösenord om du vill bekräfta formateringen av SD-kortet."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du måste bekräfta att du vill rensa USB-lagringsenheten genom att rita ditt grafiska lösenord."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du måste bekräfta att du vill rensa SD-kortet genom att rita ditt grafiska lösenord."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtalsinställningar"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ställ in röstbrevlåda, vidarebefordra samtal, samtal väntar, nummerpres."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internetdelning via USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Nästa"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Skydda din pekdator"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Skydda din telefon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Skydda pekdatorn från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut punkterna med fingret i valfri ordning på nästa sida. Du måste ansluta minst fyra punkter. "\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Skydda pekdatorn från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut punkterna med fingret i valfri ordning på nästa sida. Du måste ansluta minst fyra punkter."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Skydda mobilen från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. Anslut minst fyra punkter i valfri ordning med fingret på nästa skärm."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor text"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Använd knapp för att avsluta samtal"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Läs upp lösenord"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explore by touch"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"När Explore by Touch är aktiverat kan du höra eller se beskrivningar av det du har under fingrarna."\n\n" Funktionen är till för användare med nedsatt syn."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Fördröjning för håll ned"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Inga tjänster är installerade"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Behöver du en skärmläsare?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ger talad feedback till användare som är blinda eller har nedsatt syn. Vill du installera den gratis från Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vill du installera webbskript?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vill du att appar ska installera skript från Google som gör innehållet mer tillgängligt?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Funktionen ändrar hur enheten svarar på gester. Vill du aktivera den?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivning har angetts."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Uppgiftslagringen raderades."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Uppgiftslagringen kunde inte raderas."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Uppgiftslagring är aktiverat."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Du måste ange en PIN-kod eller ett lösenord för skärmlås för att kunna använda uppgiftslagring."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset för att kunna använda uppgiftslagring."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nödsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ange beteende vid nödsamtal"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Säkerhetskopiering och återställning"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"I förväg delad IPSec-nyckel"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-användarcertifikat"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA-certifikat"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec-servercertifikat"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Visa avancerade alternativ"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-sökdomäner"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-servrar (t.ex. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Spara kontoinformation"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(används inte)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(kontrollera inte servern)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(mottaget från server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Avbryt"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Spara"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Anslut"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Klar"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Hoppa över"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lektion 1: Utforska skärmen"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"När du har aktiverat Explore by touch kan du trycka på skärmen och få reda på vad du har under fingret. Den aktuella skärmen innehåller exempelvis appikoner. Hitta en av dem genom att trycka på skärmen och dra med fingret."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"När Explore by touch är aktiverat får du veta vad du rör vid på skärmen. Den aktuella skärmen innehåller till exempel appikoner. Om du sätter fingret på skärmen och flyttar runt lite så hittar du snart den app du vill använda."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bra. Fortsätt dra runt fingret på skärmen tills du hittar minst en ikon till."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Om du vill aktivera något som du har fingret på knackar du lätt på det. Dra fingret tills du hittar ikonen för <xliff:g id="APP_NAME">%s</xliff:g>. Knacka sedan lätt på ikonen för att aktivera den."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Fingret vilar på ikonen <xliff:g id="APP_NAME">%s</xliff:g>. Knacka lätt en gång om du vill aktivera ikonen."</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 33f3899..b343949 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Kadi ya SD inayoondolewa"</item>
     <item msgid="4498124044785815005">"Wacha mfumo uamue"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Zima"</item>
-    <item msgid="4804571292609523335">"Mtetemo"</item>
-    <item msgid="595707141547423573">"Nyamazisha"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Kila wakati"</item>
+    <item msgid="6293147072807231256">"Katu"</item>
+    <item msgid="1276641209451816572">"Ikiwa kwa mtindo kimya tu"</item>
+    <item msgid="8418930333779132418">"Wakati hapo kwenye mtindo wa Kimya pekee"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 4c2ef4c..c80b957 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Sawa"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Jina la mpangaji uliloandika si sahihi."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Orodha ya kuepusha uliyoichapisha haijaumbizwa vizuri. Andika orodha iliyotenganishwa-kituo cha vikoa vilivyoepuliwa."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Lazima ujaze sehemu ya mlango."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Unahitaji kujaza uga wa kituo."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Sehemu ya mlango sharti iwe wazi iwapo sehemu ya mpangishaji haina chochote"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Lango uliloandika si halali."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Inahitaji nenosiri au nywila ya nambari ili kutoa ufiche wa kompyuta kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Inahitaji nenosiri au nywila ya nambari ili kutoa ufiche wa kompyuta kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Usimbaji fiche"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Unaweza kuficha akaunti zako, mipangilio, programu zilizopakuliwa na data zakem midia na faili nyingine. Unapoficha simu yako hauwezi kuifichua isipokuwa unapokuwa ukiweka upya data ya kiwanda "\n\n". Ufichaji huchukua hadi saa moja. Lazima uanze na betri yenye chaji na uendelee kuchaji mpaka umalize. Ukihitilafiana na ufichaji unaweza kupoteza baadhi ya data ama yote."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data zao, media, na faili zingine. Punde unaposimba simu yako, unapaswa kuingiza PIN ya nambari au nenosiri kuisimbua kila wakati unapoiwasha: hauwezi kuisimbua simu yako isipokuwa kwa kuseti upya data kiwanda, kufuta data zako zote. "\n\n"Kusimba inachukua saa moja auzaidi. Unapaswa kuanza na betri iliyochajiwa na weka simu yako kama imechomekwa hadi usimbajifiche imekamilika. Ukikatiza utaratibu wa usimbaji fiche, utapoteza baadhi au data zako zote"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Unaweza simba fiche akaunti zako, mipangilio, programu zilizopakiwa na data zao, vyombo vya habari na faili zingine. Ukisha simba fiche kwa kompyuta yako kibao, unahitaji kuchapa PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha: Hauwezi batilisha simba fiche kwa kompyuta yako kibao isipokuwa kwa kurejesha mipangilio ya kiwandani,na kufuta data yako yote."\n\n"Usimbaji fiche unachukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke kompyuta yako kibao ikiwe imezibwa mpaka usimbaji fiche umalizike. Ukikomesha mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Unaweza simba fiche akaunti yako, mipangilio, programu zilizopakiwa na data zao, vyombo vya habari na faili nyingine. Ukisha simba fiche simu yako, unahitaji kuchapa PIN ya nambari au nenosiri ili kusimbua kila mara unapoiwasha: Hauwezi batilisha simba fiche wa simu yako isipokuwa kwa kurejesha mipangilio ya kiwandani,na kufuta data yako yote."\n\n"Usimbaji fiche unachukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke simu yako ikiwe imezibwa mpaka usimbaji fiche umalizike. Ukikomesha mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Usimbaji fiche wa kompyuta ndogo"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Simba fiche simu"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Tafadhali chaji betri yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tafadhali ingiza chaja yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Hakuna nenosiri ama nywila ya kufunga skrini"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Lazima uweke PIN au nenosiri ya kufunga skrini kabla ya kuanza kuficha."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Unahitaji kuweka PIN ya kifungio kwa skrini au nenosiri kabla kuanza usimbaji fiche."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Thibitisha usimbaji fiche"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Simba kompyuta ndogo? Hatua hii haiwezi kutenduliwa na ukiikatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo kompyuta ndogo itajiwasha tena."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Simba simu? Uendeshaji huu hauridi nyuma na ikiwa utahitilafiana nao, utapoteza data. Usimbaji huchukua saa moja au zaidi, wakati huo simu itajiwasha upya mara nyingi. Unaweza kupoteza baadhi ya data ukitatiza mchakato wa kuficha."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Jaribu tena baada ya sekunde <xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Andika nenosiri yako"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Usimbaji fiche haujafanikiwa"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Fiche imekatishwa na haiwezi kukamilika. Matokeo yake, taarifa kwenye kibao chako haziwezi kuonekana. "\n" "\n" Ili uendelee kutumia kibao chako, lazima useti upya kama ilivyotoka kiwandani. Utakapo seti kibao chako baada ya kuseti upya, utakuwa na fursa kurejesha taarifa zozote zilizotunzwa kwenye Akaunti yako ya Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Fiche imekatishwa na haiwezi kukamilika. Matokeo yake, taarifa kwenye simu yako haziwezi kuonekana. "\n" "\n" Ili uendelee kutumia simu yako, lazima useti upya simu yako kama ilivyotoka kiwandani. Utakapo seti simu yako baada ya kuseti upya, utakuwa na fursa kurejesha taarifa zozote zilizotunzwa kwenye Akaunti yako ya Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye kompyuta yako kibao haiwezi kupatikana. "\n\n" Ili kuendelee kutumia kompyuta yako kibao, unahitaji kurejesha mipangilio ya kiwandani. Ukisha washa kompyuta yako kibao baada ya kurejesha, utakuwa na fursa ya kurejesha data yoyote iliyokuwa imechelezwa kwenye Akaunti yako ya Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye simu yako haziwezi kuonekana. "\n\n" Ili kuendelea kutumia simu yako, utahitaji urejesha mipangilio ya kiwandani. Utakapowasha simu yako baada ya kurejesha, utakuwa na fursa ya kurejesha data zozote ulizocheleza kwenye Akaunti yako ya Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Chagua kifungio cha skrini"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chagua kifungio cha hifadhi"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kufunga skrini"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hamna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slaidi"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Kufungua kwa Uso"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Imelindwa na mchoro"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Imelindwa na PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Imelindwa na nenosiri"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Ruwaza"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Nenosiri"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Lemaza kufungwa kwa skrini"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ondoa umbo la kufungua"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ondoa PIN ufunguaji"</string>
@@ -509,8 +509,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Unganisha kwa mtandao"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Sahau mtandao"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ili kutazama mitandao inayopatikana, washa Wi-Fi."</string>
-    <string name="wifi_show_advanced" msgid="1793703023711426246">"Onyesha chaguo za kindani"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ili kutazama mitandao zinazopatikana, washa Mtandao hewa."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"onyesha machaguo mahiri"</string>
     <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
     <string name="wifi_wps_pin" msgid="8242979682530043184">"Andika PIN kutoka kwa kituo cha ufikivu"</string>
     <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Sanidi WPS"</string>
@@ -528,7 +528,7 @@
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Cheti cha CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Cheti cha mtumiaji"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Kitambulisho"</string>
-    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Kitambulisho kisichojulikana"</string>
+    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Kitambulkisho kikubwa"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Nenosiri"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Onyesha nenosiri"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Mipangilio ya IP"</string>
@@ -540,7 +540,7 @@
     <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
     <string name="wifi_disabled_help" msgid="5416325603334140666">"mtandao uliepukwa kutokana na muunganisho hafifu. Zima mtindo huu kutoka kwa mipangilio &amp; scrini ya wifi, kipengee cha menyu ya Juu."</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tatizo la uthibitishaji"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko karibu"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko kwenye mpango"</string>
     <string name="wifi_wps_available_first_item" msgid="3538912605343585226">"Mtandao uliolindwa unapatikana"</string>
     <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (mtandao uliolindwa unapatikana)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Imelindwa na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Athari za muziki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Sauti ya Mlio"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Tetema wakati imenyamaza"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Tetema na ita"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Tikisika"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Taarifa msingi"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Arifu ya mwangaza wa palsi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Mlio wa simu"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Simu haija gatiwa"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Mipangilio ya gati iliyoambatishwa"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Gati haipatikani"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"azima uunganishe simu yako kabla ya kusanidi unganisho la sauti."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Lazima uunganishe simu yako kabla ya kusanidi unganisho la sauti."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Unahitaji kutia kituo kwa simu kabla ya kuanzisha kituo cha sauti."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Unahitaji kutia kituo kwa simu kabla ya kuanzisha kituo cha sauti."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Uwekaji wa sauti ya Dock"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Cheza sauti wakati unaingiza au kuondoa kompyuta ndogo kutoka kwa gati"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Chezesha sauti wakati unapoingiza au kuondoa simu nkutoka gati"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Futa taarifa zako zote za kibinafsi na zilizopakuliwa? Hauwei kutengua hatua hii!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Futa kila kitu"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Mchoro wa kufungua"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Lazima uchore mchoro wa kufungua ili uthibitishe kuweka upya data ya kiwanda."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Unahitaji kuchora mchoro wa kufungua ili kuthibitisha kurejesha mipangilio ya kiwandani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Hakuna mpangilio mpya uliofanywa kwa sababu huduma ya Mfumo wa Kufuta haipatikani."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Seti upya?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Futa hifadhi ya USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Futa kadi ya SD, inafuta faili zote zilizohifadhiwa huko? Hauwezi kutengua hatua hii!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Futa kila kitu"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Chora mchoro wako wa kufungua"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Lazima uchore mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta hifadhi ya USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Lazima uchore mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta kadi ya SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta hifadhi ya USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta kadi ya SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mipangilio ya simu"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Weka mipangilio ya ujumbe wa sauti, kupitisha simu, kusubiri simu, kitambulisho cha mteja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Inazuia USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Ifuatayo"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Kulinda kompyuta yako ndogo"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Kulinda simu yako"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Linda kompyuta yako ndogo dhidi ya matumizi yasiyoidhinishwa kwa kuunda kiolezo wa kibinafsi ya kufungua. Tumia kidole chako ili kuunganisha vitone katika mpangilio wowote kwenye skrini ifuatayo. Lazima uunganishe angalau vitonne vinne. "\n\n" Uko tayari kuanza? Gusa Ifuatayo."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Linda kompyuta yako kibao dhidi ya matumizi ambayo hayajaidhinishwa kwa kuunda skrini ya kibinafsi ya mchoro wa kufungua. Sogeza kidole chako ili kuunganisha madoa katika mpangilio wowote kwenye skrini ifuatayo. Lazima uunganishe angalau madoa manne. "\n\n"Uko tayari kuanza? Gusa Ifuatayo."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Linda simu yako na matumizi yasiyoidhinishwa kwa kuunda umbizo la kufungua skrini ya kibinafsi. Tumia kidole chako kuunganisha angalau doti nne kwa mpangilio wowote kwenye skrini ifuatayo "\n\n"Tayari kuanza? Gusa “Ifuatayo”."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Dhibiti programu"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Dhibiti na ondoa programu zilizosakinishwa"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Mfumo"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Maandishi makubwa"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"kitufe cha nguvu kinamaliza upigaji simu"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Zungumza manenosiri"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Gundua kwa mguzo"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Wakati Explore by Touch imewashwa, unaweza kusikia au kuona ufafanuzi ulio chini ya kidole chako."\n\n" Kipengele hiki ni cha watumiaji wasioona vizuri"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Gusa &amp; shikilia kuchelewa"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hakuna huduma zilizosanidiwa"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Unahitaji msomaji wa skrini?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack hutoa majibu yaliyosemwa ili kuwasaidia watumiaji vipofu na wenye-kuona kidogo. Je, unataka kuisanidi bure kutoka kwa Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Sakinisha hati za wavuti?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Je, unataka programu kusakinisha hati kutoka kwa Google ambazo zinafanya maudhui ya wavuti yao ipatikane?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Kipengele hiki hubadilisha jinsi kifaa chako  kinaitikia mguso. Kiwashe?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hakuna maelezo yaliyotolewa."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Hifadhi ya stakabadhi imefutwa"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Hifadhi ya stakabadhi haikuweza kufutwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hifadhi ya hati-tambulishi imewezeshwa."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Lazima uweke PIN au nenosiri ya kufunga skrini kabla utumie hifadhi ya stakabadhi."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN ya kifungio kwa skrini au nenosiri kabla ya kutumia hifadhi ya hati."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Kuweka nakala na kuweka mipangilio upya"</string>
@@ -1525,9 +1523,7 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Ufunguo wa IPSec ulioshirikiwa mapema"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Cheti cha mtumiaji cha IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Cheti cha IPSec CA"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
-    <string name="vpn_show_options" msgid="7182688955890457003">"Onyesha chaguo za kindani"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"onyesha chaguo mahiri"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Vikoa vya utafutaji DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Seva ya DNS(mfano 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"Njia za usambazaji (mfano 10.0.0.0 / 8)"</string>
@@ -1536,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Hifadhi maelezo ya akaunti"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(haijatumika)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(usithibitishe seva)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"Ghairi"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Hifadhi"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Unganisha"</string>
@@ -1561,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Maliza"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ruka mafunzo"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Somo la 1: kuzindua skrini"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Baada ya kurejea kwenye Vumbua na GusaTouch, unaweza kugusa skrini ili kujifunza kile kilichoko chini ya kidole chako. Kwa mfano, skrini ya sasa ina aikoni za programu. Tafuta moja yao kwa kugusa skrini na kuteleza kidole chako kote."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Wakati Uchunguzi kwa Kugusa umewashwa, unaweza kugusa skrini ili kujifunza yaliyo chini ya kidole chako. Kwa mfano, skrini ya sasa ina ikoni za programu. Pata moja kwa kugusa skrini na kusogeza kidole chako kote."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Nzuri. Endelea kuslaidi kidole chako kwenye skrini hadi upate angalau ikoni moja."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Ili kuamilisha kitu ambacho unakigusa, kigonge. Telezesha kidole hadi upate ikoni ya <xliff:g id="APP_NAME">%s</xliff:g>. Kisha gonga ikoni mara moja ili kuiamilisha."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Kidole chako kinagusa ikoni ya <xliff:g id="APP_NAME">%s</xliff:g>. Gonga mara moja ili kuamilisha ikoni."</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index e98df21..acc2216 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"การ์ด SD แบบนำออกได้"</item>
     <item msgid="4498124044785815005">"ให้ระบบเลือก"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"ปิด"</item>
-    <item msgid="4804571292609523335">"สั่น"</item>
-    <item msgid="595707141547423573">"ปิดเสียง"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"ทุกครั้ง"</item>
+    <item msgid="6293147072807231256">"ไม่ต้องเลย"</item>
+    <item msgid="1276641209451816572">"เฉพาะในโหมดปิดเสียงเรียกเข้า"</item>
+    <item msgid="8418930333779132418">"เฉพาะเมื่อไม่อยู่ในโหมดปิดเสียงเรียกเข้า"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 775e74b..d23c42c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ตกลง"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"ชื่อโฮสต์ที่คุณพิมพ์ไม่ถูกต้อง"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"รายการยกเว้นที่คุณพิมพ์มีรูปแบบไม่ถูกต้อง พิมพ์รายการโดเมนที่ยกเว้นโดยคั่นด้วยเครื่องหมายจุลภาค"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"คุณต้องกรอกข้อมูลฟิลด์พอร์ต"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"คุณต้องกรอกข้อมูลในฟิลด์พอร์ต"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ฟิลด์พอร์ตจะต้องว่างถ้าไม่ได้ใส่ข้อมูลฟิลด์โฮสต์"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"พอร์ตที่คุณพิมพ์ไม่ถูกต้อง"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"พร็อกซี HTTP มีการใช้งานโดยเบราว์เซอร์ แต่อาจไม่มีการใช้งานโดยแอปพลิเคชันอื่น"</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"จำเป็นต้องใช้ PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสแท็บเล็ตของคุณทุกครั้งที่คุณเปิดเครื่อง"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"จำเป็นต้องใช้ PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสโทรศัพท์ของคุณทุกครั้งที่คุณเปิดเครื่อง"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ที่เข้ารหัส"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ได้ เมื่อคุณเข้ารหัสแท็บเล็ต คุณต้องป้อน PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสทุกครั้งที่คุณเปิดเครื่อง โดยคุณจะไม่สามารถยกเลิกการเข้ารหัสได้ยกเว้นด้วยการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมดในแท็บเล็ตของคุณ"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณจะต้องเริ่มดำเนินการโดยใช้แบตเตอรี่ที่ชาร์จจนเต็มและเสียบปลั๊กแท็บเล็ตของคุณไว้จนกว่าการเข้ารหัสจะเสร็จสิ้น หากขั้นตอนการเข้ารหัสหยุดชะงัก ข้อมูลบางส่วนหรือทั้งหมดของคุณจะสูญหาย"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมา ตลอดจนข้อมูลในแอปพลิเคชัน สื่อ และไฟล์อื่นๆ ได้ เมื่อคุณเข้ารหัสโทรศัพท์ของคุณ คุณต้องป้อน PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสทุกครั้งที่คุณเปิดเครื่อง โดยคุณจะไม่สามารถยกเลิกการเข้ารหัสโทรศัพท์ได้ยกเว้นด้วยการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมดของคุณ"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณจะต้องเริ่มดำเนินการโดยใช้แบตเตอรี่ที่ชาร์จจนเต็มและเสียบปลั๊กโทรศัพท์ของคุณไว้จนกว่าการเข้ารหัสจะเสร็จสิ้น หากขั้นตอนการเข้ารหัสหยุดชะงัก ข้อมูลบางส่วนหรือทั้งหมดของคุณจะสูญหาย"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสแท็บเล็ตแล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถยกเลิกการเข้ารหัสแท็บเล็ตได้เว้นแต่จะทำการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กแท็บเล็ตไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสโทรศัพท์แล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถยกเลิกการเข้ารหัสโทรศัพท์ได้เว้นแต่จะรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กโทรศัพท์ไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"เข้ารหัสแท็บเล็ต"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"เข้ารหัสโทรศัพท์"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"ชาร์จแบตเตอรี่และลองอีกครั้ง"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"เสียบที่ชาร์จของคุณ แล้วลองอีกครั้ง"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ไม่มี PIN หรือรหัสผ่านล็อกหน้าจอ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"คุณต้องตั้งค่า PIN หรือรหัสผ่านล็อกหน้าจอก่อน จึงจะเริ่มการเข้ารหัสได้"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"คุณต้องตั้งค่า PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะเริ่มการเข้ารหัสได้"</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"ยืนยันการเข้ารหัส"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"เข้ารหัสแท็บเล็ตหรือไม่ การทำงานนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น แท็บเล็ตจะรีสตาร์ทหลายครั้ง"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"เข้ารหัสโทรศัพท์หรือไม่ การทำงานนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น โทรศัพท์จะรีสตาร์ทหลายครั้ง"</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"ลองใหม่อีกครั้งใน <xliff:g id="DELAY">^1</xliff:g> วินาที"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"พิมพ์รหัสผ่านของคุณ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสไม่สำเร็จ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น ส่งผลให้คุณไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป"\n\n"ในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตให้เป็นค่าเริ่มต้นจากโรงงาน เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น ส่งผลให้คุณไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป"\n\n"ในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตให้เป็นค่าเริ่มต้นจากโรงงาน เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป"\n\n"ในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป"\n\n"ในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"เลือกการล็อกหน้าจอ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"เลือกการล็อกข้อมูลสำรอง"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ไม่มี"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"เลื่อน"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"รักษาความปลอดภัยด้วยรูปแบบ"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"รักษาความปลอดภัยด้วย PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"รักษาความปลอดภัยด้วยรหัสผ่าน"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"รูปแบบ"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"รหัสผ่าน"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ปิดการล็อกหน้าจอ"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"นำรูปแบบการปลดล็อกออก"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"นำ PIN ปลดล็อกออก"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"เอฟเฟ็กต์เพลง"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"ระดับความดังเสียงเรียกเข้า"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"สั่นเตือนเมื่อปิดเสียง"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"สั่นและส่งเสียง"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"สั่น"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"ค่าการแจ้งเตือนเริ่มต้น"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"ไฟแจ้งเตือนพัลซ์"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"เสียงเรียกเข้า"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"โทรศัพท์ไม่ได้ต่อกับแท่นชาร์จ"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"การตั้งค่าสำหรับแท่นชาร์จที่เสียบอยู่"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"ไม่พบแท่นชาร์จ"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"คุณต้องวางแท็บเล็ตบนแท่นชาร์จก่อนที่จะตั้งค่าเสียงสำหรับใช้บนแท่นชาร์จ"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"คุณต้องวางโทรศัพท์บนแท่นชาร์จก่อนที่จะตั้งค่าเสียงสำหรับใช้บนแท่นชาร์จ"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"คุณต้องวางแท็บเล็ตบนแท่นชาร์จก่อนที่จะตั้งค่าเสียงสำหรับใช้บนแท่นชาร์จ"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"คุณต้องวางโทรศัพท์บนแท่นชาร์จก่อนที่จะตั้งค่าเสียงสำหรับใช้บนแท่นชาร์จ"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"เสียงเมื่อเสียบแท่นชาร์จ"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"เล่นเสียงเมื่อใส่หรือนำแท็บเล็ตออกจากฐานรอง"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"เล่นเสียงเมื่อใส่หรือถอดโทรศัพท์ออกจากแท่นชาร์จ"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"ลบข้อมูลส่วนบุคคลและแอปพลิเคชันที่ดาวน์โหลดของคุณทั้งหมดหรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ลบทุกอย่าง"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"วาดรูปแบบการปลดล็อก"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"คุณต้องวาดรูปแบบการปดล็อกเพื่อยืนยันการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"ไม่มีการรีเซ็ตเนื่องจากบริการล้างข้อมูลระบบไม่พร้อมใช้งาน"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"รีเซ็ตหรือไม่"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"ลบที่เก็บข้อมูล USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ต้องการลบการ์ด SD ซึ่งจะเป็นการลบไฟล์ทั้งหมดที่จัดเก็บไว้หรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ลบทุกอย่าง"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"วาดรูปแบบการปลดล็อก"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบที่เก็บข้อมูล USB"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบการ์ด SD"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบที่จัดเก็บข้อมูล USB"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบการด์ SD"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"การตั้งค่าการโทร"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ตั้งค่าข้อความเสียง การโอนสาย สายเรียกซ้อน หมายเลขผู้โทร"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"ปล่อยสัญญาณผ่าน USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"ถัดไป"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"การรักษาความปลอดภัยแท็บเล็ตของคุณ"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"การป้องกันโทรศัพท์ของคุณ"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"ปกป้องแท็บเล็ตของคุณจากการใช้งานที่ไม่ได้รับอนุญาตด้วยการสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วของคุณเพื่อเชื่อมต่อจุดต่างๆ ในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่อจุดอย่างน้อยสี่จุด"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"ปกป้องแท็บเล็ตของคุณจากการใช้งานที่ไม่ได้รับอนุญาตด้วยการสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วเพื่อเชื่อมต่อจุดต่างๆ ในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่อจุดอย่างน้อยสี่จุด"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"ปกป้องโทรศัพท์ของคุณจากการใช้งานที่ไม่ได้รับอนุญาต โดยสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วของคุณเพื่อเชื่อมต่อจุดอย่างน้อยสี่จุดในลำดับใดก็ได้ในหน้าจอถัดไป"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"จัดการแอปพลิเคชัน"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"จัดการและนำแอปพลิเคชันที่ติดตั้งไว้ออก"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"ระบบ"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"ข้อความขนาดใหญ่"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"พูดรหัสผ่าน"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"สำรวจโดยการแตะ"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"เมื่อ \"สำรวจด้วยการแตะ\" เปิดอยู่ คุณจะได้ยินหรือฟังคำอธิบายสำหรับสิ่งที่คุณแตะอยู่"\n\n" คุณลักษณะนี้สำหรับผู้ใช้ที่มีปัญหาด้านสายตา"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"การหน่วงเวลาด้วยการแตะค้างไว้"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ไม่ได้ติดตั้งบริการใดไว้"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"ต้องใช้โปรแกรมอ่านหน้าจอหรือไม่"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack มีการตอบสนองด้วยเสียงเพื่อช่วยเหลือผู้พิการทางสายตาและผู้มีปัญหาทางสายตา คุณต้องการติดตั้งแอปพลิเคชันฟรีนี้จาก Android Market หรือไม่"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"ต้องการติดตั้งเว็บสคริปต์หรือไม่"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"คุณต้องการให้แอปพลิเคชันติดตั้งสคริปต์จาก Google เพื่อให้เข้าถึงเนื้อหาเว็บได้มากขึ้นหรือไม่"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"คุณลักษณะนี้จะเปลี่ยนวิธีการที่อุปกรณ์ของคุณตอบสนองต่อการแตะ ต้องการเปิดใช้งานหรือไม่"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ไม่มีคำอธิบาย"</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"ที่จัดเก็บข้อมูลรับรองถูกลบ"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"ไม่สามารถลบที่เก็บข้อมูลรับรอง"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"เปิดการใช้งานที่จัดเก็บข้อมูลรับรองไว้"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"คุณต้องตั้ง PIN หรือรหัสผ่านสำหรับล็อกหน้าจอก่อน จึงจะสามารถใช้ที่เก็บข้อมูลรับรองได้"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"คุณต้องตั้ง PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะสามารถใช้ที่เก็บข้อมูลรับรองได้"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"โทนเสียงฉุกเฉิน"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"การสำรองข้อมูลและการรีเซ็ต"</string>
@@ -1525,8 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"คีย์ IPSec ที่แบ่งปันไว้ล่วงหน้า"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"ใบรับรองผู้ใช้ IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"ใบรับรอง IPSec CA"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"แสดงตัวเลือกขั้นสูง"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"โดเมนการค้นหา DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"เซิร์ฟเวอร์ DNS (เช่น 8.8.8.8)"</string>
@@ -1536,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"บันทึกข้อมูลบัญชี"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ไม่ใช้)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ไม่ตรวจสอบเซิร์ฟเวอร์)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"ยกเลิก"</string>
     <string name="vpn_save" msgid="4233484051644764510">"บันทึก"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"เชื่อมต่อ"</string>
@@ -1561,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"เสร็จสิ้น"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"ข้ามคู่มือ"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"บทที่ 1: การสำรวจหน้าจอ"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"หลังจากที่เปิดใช้งาน \"สำรวจโดยการแตะ\" คุณสามารถแตะหน้าจอเพื่อเรียนรู้สิ่งต่างๆ ที่อยู่ใต้นิ้วมือของคุณได้ ตัวอย่างเช่น หน้าจอปัจจุบันมีไอคอนของแอปพลิเคชันต่างๆ ลองมองหาสักหนึ่งไอคอนด้วยการแตะหน้าจอและเลื่อนนิ้วของคุณไปรอบๆ"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"หลังจากที่เปิดใช้งาน \"สำรวจโดยการแตะ\" คุณสามารถแตะหน้าจอเพื่อเรียนรู้สิ่งต่างๆ ที่อยู่ใต้นิ้วมือของคุณได้ ตัวอย่างเช่น หน้าจอปัจจุบันมีไอคอนของแอปพลิเคชันต่างๆ ลองมองหาสักไอคอนหนึ่งด้วยการแตะหน้าจอและเลื่อนนิ้วของคุณไปรอบๆ"</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"ดี ให้เลื่อนนิ้วของคุณไปเรื่อยๆ ทั่วหน้าจอจนกว่าคุณจะพบไอคอนอีกอย่างน้อยหนึ่งไอคอน"</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"หากต้องการเปิดใช้งานสิ่งที่คุณแตะอยู่ ให้แตะสิ่งนั้น เลื่อนนิ้วของคุณไปจนพบไอคอน <xliff:g id="APP_NAME">%s</xliff:g> จากนั้นแตะที่ไอคอนหนึ่งครั้งเพื่อเปิดใช้งาน"</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"นิ้วของคุณแตะอยู่ที่ไอคอน <xliff:g id="APP_NAME">%s</xliff:g> แตะหนึ่งครั้งเพื่อเปิดใช้งานไอคอน"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index cb3aa50..c63c10b 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Naaalis na SD card"</item>
     <item msgid="4498124044785815005">"Hayaang magpasya ang system"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"I-off"</item>
-    <item msgid="4804571292609523335">"I-vibrate"</item>
-    <item msgid="595707141547423573">"I-mute"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Palagi"</item>
+    <item msgid="6293147072807231256">"Hindi Kailanman"</item>
+    <item msgid="1276641209451816572">"Nasa Silent mode lamang"</item>
+    <item msgid="8418930333779132418">"Kapag hindi lamang nasa Silent mode"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ef1c546..ef03d91 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Hindi wasto ang nai-type mong hostname."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Hindi maayos na na-format ang listahan ng pagbubukod na iyong na-type. Mag-type ng listahang pinaghihiwalay ng kuwit ng mga ibinukod na domain."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Dapat mong makumpleto ang field ng port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Kailangan mong kumpletuhin ang field ng port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Dapat na walang laman ang field ng port kung walang laman ang field ng host."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Hindi wasto ang port na iyong na-type."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng iba pang apps."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Humiling ng numerong PIN o password upang i-decrypt ang iyong tablet sa bawat oras na i-on mo ito"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Humiling ng numerong PIN o password upang i-decrypt ang iyong telepono sa bawat oras na i-on mo ito"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Na-encrypt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling i-encrypt mo ang iyong tablet, dapat kang maglagay ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito: hindi mo maaaring i-unencrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng data ng factory, na binubura ang lahat ng iyong data."\n\n"Tumatagal ang pag-encrypt nang isang oras o higit pa. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling i-encrypt mo ang iyong telepono, dapat kang maglagay ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito: hindi mo maaaring i-unencrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng data ng factory, na binubura ang lahat ng iyong data."\n\n"Tumatagal ang pag-encrypt nang isang oras o higit pa. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Maaari mong i-encrypt ang iyong mga account, setting, na-downloaded na apps at ang data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong tablet, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa bawat panahon na i-o-on mo ito: hindi mo maaaring i-unencrypt ang iyong tablet bukod sa pamamagitan ng pagsasagawa ng factory data reset, na binubura ang lahat ng iyong data."\n\n"Tumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula sa isang naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung gagambalain mo ang proseso ng pag-encrypt, mawawala mo ang ilan o ang lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at ang data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong telepono, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa bawat panahon na i-o-on mo ito: hindi mo maaaring i-unencrypt ang iyong telepono bukod sa pamamagitan ng pagsasagawa ng factory data reset, na binubura ang lahat ng data."\n\n"Tumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula sa isang naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung gagambalain mo ang proseso ng pag-encrypt, mawawala mo ang ilan o ang lahat ng iyong data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"I-encrypt ang tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"I-encrypt ang telepono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"I-charge ang iyong baterya at subukang muli."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"I-plug in ang iyong charger at subukang muli."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Walang PIN o password sa pag-lock ng screen"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Dapat kang magtakda ng PIN o password sa pag-lock ng screen bago ka maaaring magsimula ng pag-encrypt."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Kailangan mong magtakda ng PIN o password ng lock screen bago ka makakapagsimula sa pag-encrypt."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Kumpirmahin ang pag-encrypt"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"I-encrypt ang tablet? Hindi mababawi ang operation na ito at kung gambalain mo ito, mawawalan ka ng data. Tumatagal ang pag-encrypt ng isang oras o higit pa, kung saan magre-restart ang tablet nang ilang beses."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"I-encrypt ang telepono? Hindi mababawi ang operation na ito at kung gambalain mo ito, mawawalan ka ng data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung saan magre-restart ang telepono nang ilang beses."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Subukang muli sa loob ng <xliff:g id="DELAY">^1</xliff:g> (na) segundo."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"I-type ang iyong password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Hindi matagumpay ang pag-encrypt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Ang pag-encrypt ay naantala at hindi makumpleto. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong telepono, dapat kang magpaganap ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magpanumbalik ng anumang data na na-back up sa iyong Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Ang pag-encrypt ay naantala at hindi makumpleto. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong telepono, dapat kang magpaganap ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magpanumbalik ng anumang data na na-back up sa iyong Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong tablet, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong tablet pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong telepono, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Pumili ng screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pumili ng backup na lock"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"I-screen lock"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Wala"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slide"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Naka-secure na may pattern"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Naka-secure na may PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Naka-secure na may password"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Pattern"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Password"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"I-off ang lock ng screen"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alisin ang naka-unlock na pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alisin ang naka-unlock na PIN"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Mga effect sa musika"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume ng ringer"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"I-vibrate kapag naka-silent"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"I-vibrate at i-ring"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"I-vibrate"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Default na notification"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse na ilaw ng notification"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Hindi naka-dock ang telepono"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Mga setting para sa nakakabit na dock"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Hindi nakita ang dock"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Dapat mong i-dock ang telepono bago i-set up ang dock audio."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Dapat mong i-dock ang telepono bago i-set up ang dock audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Kailangan mong i-dock ang tablet bago i-set up ang dock audio."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Kailangan mong i-dock ang telepono bago i-set up ang dock audio."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Tunog sa paglagay ng dock"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Mag-play ng tunog kapag ipinapasok o inaalis ang tablet mula sa dock"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Mag-play ng tunog kapag inilalagay o inaalis ang telepono mula sa dock"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Burahin ang lahat ng iyong personal na impormasyon at na-download na apps? Hindi mo mababawi ang pagkilos na ito!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Burahin ang lahat"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Kunin ang iyong naka-unlock na pattern"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Dapat mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-reset sa data ng factory."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Kailangan mong iguhit ang iyong pattern ng pag-unlock upang magkumpirma ng factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Walang isinagawang pag-reset dahil hindi available ang serbisyong System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"I-reset?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Burahin imbakan na USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Burahin ang SD card, na tinatanggal ang lahat ng file na nakaimbak doon? Hindi mo mababawi ang pagkilos na ito!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Burahin ang lahat"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Kunin ang iyong naka-unlock na pattern"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Dapat mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin na gusto mong burahin ang imbakan na USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Dapat mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin na gusto mong burahin ang SD card."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Dapat mong iguhit ang iyong pattern ng pag-unlock upang kumpirmahin na nais mong burahin ang USB storage."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kailangan mong iguhit ang iyong pattern ng pag-unlock upang kumpirmahin na nais mong burahin ang SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mga setting ng tawag"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"I-set up ang voicemail, pagpasa ng tawag, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Pag-tether sa USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Susunod"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sine-secure ang iyong tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Pag-secure ng iyong telepono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Protektahan ang iyong tablet mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern sa pag-unlock ng screen. I-slide ang iyong daliri upang ikonekta ang mga dot sa anumang pagkakaayos sa susunod na screen. Dapat kang magkonekta ng hindi bababa sa apat na dot. "\n\n"Handa na bang magsimula? Pindutin ang Susunod."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protektahan ang iyong tablet mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern ng pag-unlock ng screen. I-slide ang iyong daliri upang ikonekta ang mga dot sa anumang pagkakaayos sa susunod na screen. Kailangan mong magkonekta ng hindi bababa sa apat na dot. "\n\n"Handa nang magsimula? Pindutin ang Susunod."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protektahan ang iyong telepono mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern sa pag-unlock ng screen. I-slide ang iyong daliri upang magkonekta ng hindi bababa sa apat na dot sa anumang kaayusan sa susunod na screen. "\n\n"Handa na bang magsimula? Pindutin ang Susunod."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Malaking teksto"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tinatapos ng power button ang tawag"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Sabihin ang mga password"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Gumalugad sa pamamagitan ng pagpindot"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kapag naka-on ang Explore by Touch, makakarinig o makakakita ka ng mga paglalarawan ng kung ano ang nasa ilalim ng iyong daliri."\n\n" Ang tampok na ito ay para sa mga low-vision na user."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Pagkaantala sa pagpindot &amp; pagdiin"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Walang mga serbisyong naka-install"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Kailangan ng screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Nagbibigay ang TalkBack ng pasalitang feedback upang matulungan ang mga user na bulag at may mahinang paningin. Nais mo ba itong i-install nang libre mula sa Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"I-install ang mga web script?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Nais mo bang mag-install ang apps ng mga script mula sa Google na ginagawang mas naa-access ang nilalaman sa web ng mga ito?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Binabago ng tampok na ito ang paraan ng pagtugon sa pagpindot sa iyong device. I-on?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Walang ibinigay na paglalarawan."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Binura storage ng kredensyal."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Di mbura storage ng krednsyal."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pinagana ang imbakan ng kredensyal."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Dapat kang magtakda ng PIN o password ng lock screen bago mo magamit ang storage ng kredensyal."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kailangan mong magtakda ng PIN o password ng lock screen bago mo magamit ang storage ng kredensyal."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tonong pang-emergency"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Itakda ang pag-uugali kapag naganap ang isang pang-emergency na tawag"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"I-backup &amp; i-reset"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec na paunang nabahaging key"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificate ng user ng IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"CA certificate ng IPSec"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"certificate ng server ng IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Ipakita ang mga advanced na pagpipilian"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Mga domain sa paghahanap ng DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Mga server ng DNS (e.g. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"I-save ang impormasyon ng account"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(hindi nagamit)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(huwag i-verify ang server)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(natanggap mula sa server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Kanselahin"</string>
     <string name="vpn_save" msgid="4233484051644764510">"I-save"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Kumonekta"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Tapusin"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Laktawan ang tutorial"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Aralin 1: Paggalugad sa screen"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Pagkatapos mong i-on ang Galugarin sa pamamagitan ng Pagpindot, maaari mong pindutin ang screen upang malaman kung ano ang nasa ilalim ng iyong daliri. Halimbawa, naglalaman ang kasalukuyang screen ng mga icon ng app. Maghanap ng isa sa mga ito sa pamamagitan ng pagpindot sa screen at pag-slide ng iyong daliri sa paligid."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Kapag na-on ang Explore by Touch, maaari mong pindutin ang screen upang malaman kung ano ang hinahawakan mo. Halimbawa, naglalaman ang kasalukuyang screen ng mga icon ng app. Hanapin ang isa sa mga ito sa pamamagitan ng pagpindot sa screen at pag-slide sa iyong daliri."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Mahusay. I-slide pa ang iyong daliri sa paligid ng screen hanggang sa makakita ka ng hindi bababa sa isa pang icon."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Upang i-activate ang isang bagay na iyong hinahawakan, tapikin ito. I-slide ang iyong daliri hanggang sa mahanap mo ang icon para sa <xliff:g id="APP_NAME">%s</xliff:g>. Pagkatapos ay tapikin ang icon nang isang beses upang i-activate ito."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Hinahawakan ng iyong daliri ang icon ng <xliff:g id="APP_NAME">%s</xliff:g>. Tapikin nang isang beses upang i-activate ang icon."</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index b2f7a18..7dc63a5 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Çıkarılabilir SD kart"</item>
     <item msgid="4498124044785815005">"Sistem karar versin"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Kapalı"</item>
-    <item msgid="4804571292609523335">"Titreşim"</item>
-    <item msgid="595707141547423573">"Ses kapalı"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Her zaman"</item>
+    <item msgid="6293147072807231256">"Hiçbir zaman"</item>
+    <item msgid="1276641209451816572">"Yalnızca Sessiz modda"</item>
+    <item msgid="8418930333779132418">"Yalnızca Sessiz modda değilken"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3358005..3704823 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Tamam"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Yazdığınız ana makine adı geçersiz."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Yazdığınız dışlama listesi doğru biçimlendirilmemiş. Dışlanan alan adlarının virgülle ayrılmış listesini yazın."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Bağlantı noktası alanını tamamlamalısınız."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Bağlantı noktası alanını tamamlamanız gerekir."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Yazdığınız bağlantı noktası geçerli değil."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Tabletinizin her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Telefonunuzun her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Şifreli"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, cihazı her açtığınızda şifresini açmak için sayısal bir PIN veya şifre girmeniz gerekir: tabletinizdeki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, cihazı her açtığınızda şifresini açmak için sayısal bir PIN veya şifre girmeniz gerekir: telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir: tabletinizdeki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir: telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar telefonunuzu fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tableti şifrele"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefonu şifrele"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Pilinizi şarj edip tekrar deneyin."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Şarj cihazınızı takıp tekrar deneyin."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekran kilitleme PIN\'i veya şifresi yok"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Şifrelemeye başlamadan önce ekran kilitleme PIN\'i veya şifresi ayarlamalısınız."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Şifrelemeyi başlatabilmek için öncelikle ekran kilitleme PIN\'i veya şifresi ayarlamanız gerekir."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Şifrelemeyi onaylayın"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Tablet şifrelensin mi? Bu işlem geri döndürülemez ve eğer durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve tablet bu süre içinde bir çok kez yeniden başlatılır."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Telefon şifrelensin mi? Bu işlem geri döndürülemez ve eğer durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve telefon  bu süre içinde bir çok kez yeniden başlatılır."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> saniye içinde yeniden deneyin."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Şifrenizi yazın"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Şifreleme başarısız oldu"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor."\n\n"Tabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmelisiniz. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor."\n\n"Telefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmelisiniz. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor."\n\n"Tabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor."\n\n"Telefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Ekran kilidini seç"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Yedek kilidi seçin"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran kilidi"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hiçbiri"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Kaydırma"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Yüz Tanıma Kilidi"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Desenle güvenlik etkin"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN ile güvenlik etkin"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Şifre ile güvenlik etkin"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Desen"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Şifre"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Ekran kilidini kapat"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kilit açma desenini kaldır"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kilit açma PIN\'ini kaldır"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Müzik efektleri"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zil sesi düzeyi"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Sessizken titret"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Titreşim ve zil sesi"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Titreşim"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Varsayılan bildirim"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Bildirim ışığını yakıp söndür"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zil sesi"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon yuvaya takılı değil"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Takılı yuva için ayarlar"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Yuva bulunamadı"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Yuva sesinin kurulumunu yapmadan önce tableti yuvaya takmalısınız."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Yuva sesinin kurulumunu yapmadan önce telefonu yuvaya takmalısınız."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Yuva sesini ayarlamadan önce tableti yuvaya takmanız gerekir."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Yuva sesini ayarlamadan önce telefonu yuvaya takmanız gerekir."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Yuvaya yerleştirme sesi"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Tablet yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çal"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Telefon yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çal"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Tüm kişisel bilgilerinizi ve indirilen tüm uygulamaları silmek istiyor musunuz? Bu işlem geri döndürülemez!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Her şeyi sil"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Kilit açma deseninizi çizin"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Fabrika verilerine sıfırlamayı onaylamak için kilit açma deseninizi çizmelisiniz."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Fabrika verilerine sıfırlamayı onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Sıfırlansın mı?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB depolama birimini sil"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD kart silinsin mi? Burada saklanan tüm dosyalar silinir. Geri alınamaz!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Her şeyi sil"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Kilit açma deseninizi çizin"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USB depolama birimini biçimlendirmek istediğinizi onaylamak için kilit açma deseninizi çizmelisiniz."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SD kartı silmek istediğinizi onaylamak için kilit açma deseninizi çizmelisiniz."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB depolama birimini silmek istediğinizi onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD kartı silmek istediğinizi onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Çağrı ayarları"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Sesli mesaj, çağrı yönlendirme ve bekletme, arayan kimliğini ayarla"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB internet paylaşımı"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"İleri"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tabletinizin güvenliğini sağlama"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Telefonunuzu güvenlik altına alma"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Kişisel bir kilit açma deseni oluşturarak tabletinizi yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kaydırarak noktaları istediğiniz sırada birleştirin. En az dört noktayı birleştirmelisiniz. "\n\n"Başlamaya hazır mısınız? İleri\'ye dokunun."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Kişisel bir kilit açma deseni oluşturarak tabletinizi yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kaydırarak noktaları istediğiniz sırada birleştirin. En az dört noktayı birleştirmeniz gereklidir. "\n\n"Başlamaya hazır mısınız? İleri\'ye dokunun."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Kendinize özel bir ekran kilidi açma deseni oluşturarak telefonunuzu yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kullanarak en az dört noktayı istediğiniz sırayla birleştirin. "\n\n"Başlamaya hazır mısınız? \"İleri\"ye dokunun."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Yüklü uygulamaları yönet ve kaldır"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Büyük metin"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Güç düğmesi çağrıyı sonlandırır"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Şifreleri sesli olarak oku"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Dokunarak keşfet"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Explore by Touch açık olduğunda, parmağınızın altında bulunanlar ile ilgili açıklamaları duyabilir veya görebilirsiniz."\n\n" Bu özellik görüşü zayıf kullanıcılar içindir."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Dokunma ve tutma bekleme süresi"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hiçbir hizmet yüklenmedi"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Ekran okuyucusuna ihtiyacınız var mı?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack, görme engelli veya az gören kullanıcılara yardımcı olmak için sesli geri bildirim sağlar. Bu uygulamayı Android Market\'ten ücretsiz olarak yüklemek ister misiniz?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Web komut dosyaları yüklensin mi?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Uygulamaların Google\'dan web içeriklerini daha erişilebilir hale getirecek komut dosyaları yüklemesini istiyor musunuz?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Bu özellik, cihazınızın dokunmaya yanıt verme şeklini değiştirir. Açılsın mı?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hiçbir açıklama sağlanmadı."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Kimlik bilgileri deposu silindi."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Kimlik bilgileri deposu silinemedi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Kimlik bilgileri depolamasını kullanabilmek için önce ekran PIN\'i veya şifre ayarlamalısınız."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kimlik bilgileri depolamasını kullanabilmek için öncelikle bir ekran PIN\'i veya şifre ayarlamanız gerekir."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Yedekle ve sıfırla"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec önceden paylaşılan anahtar"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec kullanıcı sertifikası"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA sertifikası"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec sunucu sertifikası"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Gelişmiş seçenekleri göster"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS arama alan adları"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS sunucuları (ör. 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Hesap bilgilerini kaydet"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(kullanılmıyor)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(sunucuyu doğrulama)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(sunucudan alındı)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"İptal"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Kaydet"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Bağlan"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Son"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Eğiticiyi geç"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. Ders: Ekranı keşfetme"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"\"Dokunarak keşfet\"i açtıktan sonra, parmağınızın altında ne olduğunu öğrenmek için ekrana dokunabilirsiniz. Örneğin, mevcut ekranda uygulama simgeleri bulunuyor. Ekrana dokunup parmağınızı etrafta kaydırarak bu uygulama simgelerinden birini bulun."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"\"Dokunarak keşfet\" açıldıktan sonra, parmağınızın altında ne olduğunu öğrenmek için ekrana dokunabilirsiniz. Örneğin, mevcut ekranda uygulama simgeleri bulunuyor. Ekrana dokunup parmağınızı etrafta kaydırarak bu uygulama simgelerinden birini bulun."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Harika. En az bir tane daha yeni simge buluncaya kadar parmağınızı ekran üzerinde kaydırmaya devam edin."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Dokunduğunuz bir şeyi çalıştırmak istediğinizde üzerine hafifçe vurun. <xliff:g id="APP_NAME">%s</xliff:g> simgesini buluncaya kadar parmağınızı kaydırın. Ardından, simgenin üzerine bir defa hafifçe vurarak çalıştırın."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Parmağınızla <xliff:g id="APP_NAME">%s</xliff:g> simgesine dokunuyorsunuz. Simgeyi etkinleştirmek için bir kez hafifçe vurun."</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 1e342b7..7c89552 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Знімна карта SD"</item>
     <item msgid="4498124044785815005">"Дозвольте виріш. системі"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Вимк."</item>
-    <item msgid="4804571292609523335">"Вібросигнал"</item>
-    <item msgid="595707141547423573">"Без звуку"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Завжди"</item>
+    <item msgid="6293147072807231256">"Ніколи"</item>
+    <item msgid="1276641209451816572">"Лише в беззвуч. режимі"</item>
+    <item msgid="8418930333779132418">"Лише не в беззвучному режимі"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Короткий"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f32052f..ec4e235 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Введене ім’я хосту не дійсне."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Введений список виключень має неналежний формат. Введіть розділений комами список виключених доменів."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Треба заповнити поле порту."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Потрібно заповнити поле порту."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поле порту має бути порожнім, якщо поле хосту порожнє."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Введений порт не дійсний."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі-сервер HTTP використовується веб-переглядачем, але не може використовуватися ін. програмами."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Вимагає введення цифрового PIN-коду чи пароля для шифрування пристрою щоразу при його ввімкненні"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Вимагає введення цифрового PIN-коду чи пароля для шифрування телефону щоразу при його ввімкненні"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їхні дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код або пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Скасувати шифрування планшетного ПК можна, лише відновивши заводські налаштування, що призведе до стирання всіх даних."\n\n"Шифрування триває не менше години. Розпочинати процес шифрування треба із зарядженим акумулятором. Планшетний ПК має бути підключеним до мережі живлення, поки шифрування не закінчиться. Якщо перервати процес шифрування, ви втратите частину чи всі свої дані."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їхні дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код або пароль для розшифрування телефону щоразу під час його ввімкнення. Скасувати шифрування телефону можна, лише відновивши заводські налаштування, що призведе до стирання всіх даних."\n\n"Шифрування триває не менше години. Розпочинати процес шифрування треба із зарядженим акумулятором. Телефон має бути підключеним до мережі живлення, поки шифрування не закінчиться. Якщо перервати процес шифрування, ви втратите частину чи всі свої дані."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Планшетний ПК має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування телефону щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Телефон має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифрувати пристрій"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифрувати телефон"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядіть акумулятор і повторіть спробу."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Підключіть зарядний пристрій і повторіть спробу."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Потрібно ввести PIN-код або пароль для блокування екрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Перед початком шифрування потрібно встановити PIN-код або пароль для блокування екрана."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Щоб почати шифрування, потрібно встановити PIN-код або пароль для блокування екрана."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Підтвердити шифрування"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Зашифрувати пристрій? Ця операція незворотна, і в разі її переривання ви втратите дані. Шифрування триває не менше години. Протягом цього часу ваш пристрій перезавантажиться декілька разів."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Зашифрувати телефон? Ця операція незворотна, і в разі її переривання ви втратите дані. Шифрування триває не менше години. Протягом цього часу ваш телефон перезавантажиться декілька разів."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Спробуйте ще через <xliff:g id="DELAY">^1</xliff:g> сек."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введіть пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрування не виконано"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. "\n\n"Щоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. "\n\n"Щоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. "\n\n"Щоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. "\n\n"Щоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Вибрати тип блок. екр."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Вибер. резерв. блокув."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокування екрана"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Немає"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Провести пальцем"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Фейсконтроль"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Захищено шаблоном"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Захищено PIN-кодом"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Захищено паролем"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Ключ"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-код"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Пароль"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Вимкнути блокув. екрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Видалити ключ розблок."</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Видал. PIN розблок."</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Музичні ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Гучність дзвінка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібр. в беззвуч. реж."</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Вібросигнал і дзвінок"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Вібрув."</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Сповіщення за умовчанням"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Блим. світл. сигн. сповіщ."</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодія"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Телефон не вставл."</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Налашт-ня для підключеної станції"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Станц. не знайд."</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Для налаштування звуку док-станції потрібно вставити в неї планшетний ПК."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Для налаштування звуку док-станції потрібно вставити в неї телефон."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Для налаштування звуку док-станції потрібно вставити в неї планшетний ПК."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Для налаштування звуку док-станції потрібно вставити в неї телефон."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Звук вставлення в док-станцію"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Грати звук під час вставл. чи виймання пристр. зі станції"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Грати звук під час вставл. чи виймання тел. зі станції"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Стерти всю особисту інформацію та завантажені програми? Цю дію не можна скасувати!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Видалити все"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Намалюйте ключ розблок-ня"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Щоб підтвердити відновл. завод. налашт-нь, треба намал. ключ розблок."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Щоб підтвердити відновлення заводських налаштувань, потрібно намалювати ключ розблокування."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Скидання не виконано, оскільки служба очищення системи не доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Скинути?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистити носій USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Стерти карту SD, видаливши всі збережені на ній файли? Цю дію не можна скасувати!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Видалити все"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Намалюйте ключ розблок-ня"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Щоб підтвердити очищення носія USB, треба намалювати ключ розблокування."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Щоб підтвердити очищення карти SD, треба намалювати ключ розблокування."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Щоб підтвердити очищення носія USB, треба намалювати ключ розблокування."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Щоб підтвердити очищення карти SD, треба намалювати ключ розблокування."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Налашт. виклику"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Налашт. гол.пошту, переадр.викл., парал.викл., ідент.абонента"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Прив\'язка USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Далі"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Захист вашого пристрою"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Захист вашого телефону"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Захистіть свій планшетний ПК від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному крані пальцем з’єднайте крапки в будь-якому порядку. Потрібно з’єднати принаймні чотири крапки. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Захистіть свій планшетний ПК від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному екрані пальцем з’єднайте крапки в будь-якому порядку. Потрібно з’єднати принаймні чотири крапки. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Захистіть свій телефон від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному екрані пальцем з’єднайте принаймні чотири крапки в будь-якому порядку. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Керувати програмами"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Керувати встановленими програмами та видаляти їх"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Великий текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка живлення закінчує виклик"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Диктувати паролі"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Дослідження дотиком"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Коли ввімкнено функцію дослідження дотиком, можна побачити або почути опис елемента, розташованого під вашим пальцем."\n\n"Ця функція призначена для користувачів зі слабким зором."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Затримка натискання й утримування"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Не встановлено жодної служби"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Потрібна програма зчитування з екрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Функція TalkBack забезпечує мовне голосове відтворення для користувачів із вадами зору. Хочете встановити її безкоштовно з Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Установити веб-сценарії?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Дозволити програмам установлювати сценарії від Google, які зроблять веб-вміст більш доступним?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ця функція змінює реакцію вашого пристрою на дотик. Увімкнути?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Немає опису."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Сховище облік. даних очищено."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Схов.облік.даних неможл.видал."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Сховище облік. даних увімкнено."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Потрібно встановити PIN-код або пароль блокування екрана, перш ніж ви зможете використовувати сховище облікових даних."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Щоб використовувати сховище облікових даних, потрібно встановити PIN-код або пароль для блокування екрана."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Аварійний сингал"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Устан. поведінку при розміщ. аварійного виклику"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Резервне копіювання та скидання"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Спільний ключ IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Сертифікат користувача IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Сертифікат IPSec від ЦС"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Сертифікат сервера IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Показати розширені параметри"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Домени DNS пошуку"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-сервери (напр., 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Зберегти інформацію про обліковий запис"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(не використовується)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(не перевіряти сервер)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(отриманий із сервера)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Скасувати"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Зберегти"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Під’єднатися"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Закінчити"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Пропустити"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1. Дослідження екрана"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Увімкнувши функцію дослідження дотиком, можна торкатися екрана, щоб дізнаватися, що розташовано під вашим пальцем. Наприклад, на поточному екрані є піктограми програм. Знайдіть одну з них, торкаючись екрана та пересуваючи по ньому пальцем."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Увімкнувши функцію дослідження дотиком, можна торкнутися екрана й дізнатися, що розташовано під вашим пальцем. Наприклад, на поточному екрані є піктограми програм. Знайдіть одну з них, торкаючись екрана та пересуваючи по ньому пальцем."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добре. Водіть пальцем по екрану, доки не знайдете принаймні ще один значок."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Щоб активувати елемент, якого ви торкаєтеся, швидко натисніть його. Проводьте пальцем, доки не знайдете піктограму програми <xliff:g id="APP_NAME">%s</xliff:g>. Після цього швидко натисніть її один раз, щоб активувати програму."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ваш палець торкається значка програми <xliff:g id="APP_NAME">%s</xliff:g>. Торкніться один раз, щоб активувати значок."</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 1a5db8d..fab30f3 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Thẻ SD tháo lắp được"</item>
     <item msgid="4498124044785815005">"Cho phép hệ thống quyết định"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Tắt"</item>
-    <item msgid="4804571292609523335">"Rung"</item>
-    <item msgid="595707141547423573">"Tắt tiếng"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Luôn luôn"</item>
+    <item msgid="6293147072807231256">"Không bao giờ"</item>
+    <item msgid="1276641209451816572">"Chỉ ở chế độ Im lặng"</item>
+    <item msgid="8418930333779132418">"Chỉ khi không ở chế độ Im lặng"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 0a6de10..afaaebf 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Tên máy chủ lưu trữ bạn nhập không hợp lệ."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Danh sách loại trừ bạn đã nhập không được định dạng đúng. Vui lòng nhập danh sách các tên miền loại trừ được phân tách bằng dấu phẩy."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Bạn phải hoàn tất trường cổng."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Bạn cần hoàn tất trường cổng."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Trường cổng phải trống nếu trường máy chủ lưu trữ trống."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Cổng bạn đã nhập không hợp lệ."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP được sử dụng bởi trình duyệt nhưng có thể không được sử dụng bởi các ứng dụng khác."</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Đã mã hóa"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống cũng như dữ liệu, phương tiện và các tệp khác. Sau khi bạn mã hóa máy tính bảng của mình, bạn phải nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật máy tính bảng: bạn không thể hủy mã hóa máy tính bảng của mình ngoại trừ bằng cách thực hiện đặt lại về dữ liệu gốc, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa diễn ra từ một tiếng trở lên. Bạn phải bắt đầu bằng pin đã sạc và giữ cho máy tính bảng của bạn ở chế độ sạc cho đến khi quá trình mã hóa hoàn tất. Nếu bạn làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của mình."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống cũng như dữ liệu, phương tiện và các tệp khác. Sau khi bạn mã hóa điện thoại của mình, bạn phải nhập mã PIN số hoặc mật khẩu để giải mã điện thoại mỗi lần bạn bật điện thoại: bạn không thể hủy mã hóa điện thoại của mình ngoại trừ bằng cách thực hiện đặt lại dữ liệu gốc, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa diễn ra từ một tiếng trở lên. Bạn phải bắt đầu bằng pin đã sạc và giữ điện thoại của bạn ở chế độ sạc cho đến khi quá trình mã hóa hoàn tất. Nếu bạn làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của mình."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa máy tính bảng, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật máy tính bảng: bạn không thể hủy mã hóa máy tính bảng trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm máy tính bảng cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của mình."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa điện thoại, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật điện thoại: bạn không thể hủy mã hóa điện thoại trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm điện thoại cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của mình."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Mã hóa máy tính bảng"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Mã hóa điện thoại"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Vui lòng sạc pin và thử lại."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Vui lòng cắm bộ sạc của bạn và thử lại."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Không có mật khẩu hoặc PIN khóa màn hình"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Bạn phải đặt mật khẩu hoặc PIN khóa màn hình trước khi bạn có thể bắt đầu quá trình mã hóa."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể bắt đầu quá trình mã hóa."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Xác nhận mã hóa"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Mã hóa máy tính bảng? Tác vụ này không thể đảo ngược được và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra từ một tiếng trở lên, trong thời gian này máy tính bảng sẽ khởi động lại nhiều lần."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Mã hóa điện thoại? Tác vụ này không thể đảo ngược và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra một tiếng trở lên, trong quá trình này điện thoại sẽ khởi động lại nhiều lần."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Hãy thử lại sau <xliff:g id="DELAY">^1</xliff:g> giây."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Nhập mật khẩu của bạn"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Mã hóa không thành công"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn truy cập được. "\n\n" Để tiếp tục sử dụng máy tính bảng của mình, bạn phải thực hiện đặt lại cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn truy cập được. "\n\n"Để tiếp tục sử dụng điện thoại của mình, bạn phải thực hiện đặt lại cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Quá trình mã hóa đã bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn có thể truy cập được. "\n\n" Để tiếp tục sử dụng máy tính bảng của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn có thể truy cập được. "\n\n"Để tiếp tục sử dụng điện thoại của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Chọn khóa màn hình"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chọn khóa dự phòng"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Khóa màn hình"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Không"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Trượt"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Mở khóa bằng khuôn mặt"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Được bảo mật bằng hình"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Được bảo mật bằng PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Được bảo mật bằng mật khẩu"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Hình"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Mã PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mật khẩu"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Tắt khóa màn hình"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Xóa hình mở khóa"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Xóa mã PIN mở khóa"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Hiệu ứng âm nhạc"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Âm lượng chuông"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rung khi im lặng"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Rung và đổ chuông"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Rung"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Thông báo mặc định"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Đèn thông báo dạng xung"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nhạc chuông"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Điện thoại chưa được gắn đế"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Cài đặt cho đế được gắn vào"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Không tìm thấy đế"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Bạn phải gắn đế cho máy tính bảng trước khi thiết lập âm thanh đế."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Bạn phải gắn đế cho điện thoại trước khi thiết lập âm thanh đế."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Bạn cần gắn máy tính bảng vào đế trước khi thiết lập âm thanh đế."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Bạn cần gắn điện thoại vào đế trước khi thiết lập âm thanh đế."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Âm thanh khi lắp đế"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Phát âm thanh khi lắp hoặc tháo máy tính bảng khỏi đế"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Xóa tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Xóa mọi thứ"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Vẽ hình mở khóa của bạn"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Bạn phải vẽ hình mở khóa của mình để xác nhận đặt lại về dữ liệu gốc."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Bạn cần vẽ hình mở khóa để xác nhận thiết lập lại dữ liệu ban đầu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Không có tác vụ đặt lại nào được thực hiện vì dịch vụ Xóa hệ thống không khả dụng."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Đặt lại?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Xóa bộ nhớ USB"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Xóa thẻ SD, xóa tất cả các tệp được lưu trữ ở đó? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Xóa mọi thứ"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Vẽ hình mở khóa của bạn"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Bạn phải vẽ hình mở khóa của mình để xác nhận rằng bạn muốn xóa bộ nhớ USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Bạn phải vẽ hình mở khóa của mình để xác nhận rằng bạn muốn xóa thẻ SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Bạn cần vẽ hình mở khóa để xác nhận rằng bạn muốn xóa bộ lưu trữ USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Bạn cần vẽ hình mở khóa để xác nhận rằng bạn muốn xóa thẻ SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Cài đặt cuộc gọi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Thiết lập thư thoại, chuyển tiếp cuộc gọi, chờ cuộc gọi, Số gọi đến"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Dùng làm điểm truy cập Internet qua USB"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Tiếp theo"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Đang bảo vệ máy tính bảng của bạn"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Đang bảo vệ điện thoại của bạn"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Bảo vệ máy tính bảng của bạn khỏi hành vi sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Trượt ngón tay để kết nối các điểm theo thứ tự bất kỳ trên màn hình tiếp theo. Bạn phải kết nối ít nhất bốn điểm. "\n\n"Bạn đã sẵn sàng bắt đầu chưa? Hãy chạm Tiếp theo."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Bảo vệ máy tính bảng của bạn khỏi hành vi sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Trượt ngón tay để kết nối các điểm theo thứ tự bất kỳ trên màn hình tiếp theo. Bạn cần kết nối ít nhất bốn điểm. "\n\n"Bạn đã sẵn sàng bắt đầu chưa? Hãy chạm vào Tiếp theo."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Bảo vệ điện thoại của bạn khỏi hành vi sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Trượt ngón tay để kết nối ít nhất bốn điểm theo thứ tự bất kỳ trên màn hình tiếp theo. "\n\n"Bạn đã sẵn sàng bắt đầu chưa? Hãy chạm vào Tiếp theo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Quản lý ứng dụng"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Quản lý và xóa ứng dụng đã cài đặt"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Hệ thống"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Chữ lớn"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Nút Nguồn kết thúc cuộc gọi"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Nói mật khẩu"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Khám phá bằng cách chạm"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Khi bật Khám phá bằng cách chạm, bạn có thể nghe hoặc nhìn thấy mô tả của nội dung dưới ngón tay của bạn."\n\n" Tính năng này dùng cho những người có thị lực kém."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Thời gian chờ cho Chạm &amp; giữ"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Chưa có dịch vụ nào được cài đặt"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Cần trình đọc màn hình?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack cung cấp phản hồi bằng giọng nói nhằm giúp người dùng bị mù và mắt kém. Bạn có muốn cài đặt ứng dụng này miễn phí từ Android Market không?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Cài đặt tập lệnh web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Bạn có muốn ứng dụng cài đặt tập lệnh từ Google làm cho nội dung web của chúng dễ truy cập hơn?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Tính năng này thay đổi cách thiết bị của bạn phản hồi với tác vụ chạm. Bật?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Không có mô tả nào được cung cấp."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Bộ nhớ thông tin xác thực đã bị xóa."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Ko thể xóa b.nhớ t.tin x.thực."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Bộ nhớ thông tin xác thực đã bật."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Bạn phải đặt mật khẩu hoặc mã PIN của màn hình khóa trước khi bạn có thể sử dụng vùng lưu trữ thông tin xác thực."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể sử dụng vùng lưu trữ thông tin xác thực."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Âm khẩn cấp"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Đặt chế độ khi cuộc gọi khẩn cấp được thực hiện"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sao lưu &amp; đặt lại"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Khóa chia sẻ trước IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Chứng chỉ người dùng IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Chứng chỉ IPSec CA"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Chứng chỉ máy chủ IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Hiển thị tùy chọn nâng cao"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Tên miền tìm kiếm DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Máy chủ DNS (ví dụ: 8.8.8.8)"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Lưu thông tin tài khoản"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(không được sử dụng)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(không xác minh máy chủ)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(đã nhận từ máy chủ)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Hủy"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Lưu"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Kết nối"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Kết thúc"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Bỏ qua h.d"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Bài 1: Khám phá màn hình"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Sau khi bạn bật Khám phá bằng cách chạm, bạn có thể chạm vào màn hình để tìm hiểu xem điều gì nằm dưới ngón tay bạn. Ví dụ: màn hình hiện tại chứa các biểu tượng ứng dụng. Tìm kiếm một trong những biểu tượng đó bằng cách chạm vào màn hình và trượt ngón tay của bạn xung quanh."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Khi bật Khám phá bằng cách chạm, bạn có thể chạm vào màn hình để tìm hiểu xem điều gì nằm dưới ngón tay bạn. Ví dụ: màn hình hiện tại chứa các biểu tượng ứng dụng. Tìm kiếm một trong những biểu tượng đó bằng cách chạm vào màn hình và trượt ngón tay của bạn xung quanh."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Tốt. Tiếp tục trượt ngón tay của bạn quanh màn hình cho đến khi bạn tìm thấy ít nhất thêm một biểu tượng."</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Để kích hoạt mục bạn đang chạm vào, hãy chạm vào mục đó. Trượt ngón tay cho đến khi bạn tìm thấy biểu tượng cho <xliff:g id="APP_NAME">%s</xliff:g>. Sau đó chạm vào biểu tượng một lần để kích hoạt biểu tượng đó."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ngón tay của bạn đang chạm vào biểu tượng <xliff:g id="APP_NAME">%s</xliff:g>. Chạm một lần để kích hoạt biểu tượng."</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 44aeee3..199684d 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
     <item msgid="4498124044785815005">"由系统确定"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"关闭"</item>
-    <item msgid="4804571292609523335">"振动"</item>
-    <item msgid="595707141547423573">"静音"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"始终"</item>
+    <item msgid="6293147072807231256">"一律不"</item>
+    <item msgid="1276641209451816572">"仅在静音模式下来电振动"</item>
+    <item msgid="8418930333779132418">"仅在非静音模式下来电振动"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2cd767a..96052d9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"确定"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"您键入的主机名无效。"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"您键入的排除列表的格式不正确。请键入以逗号分隔的排除域列表。"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必须填写端口字段。"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"您需要填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空，则端口字段必须为空。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"您键入的端口无效。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"该浏览器使用 HTTP 代理，但其他应用程序可能不会使用。"</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"您每次开机时都需要输入数字 PIN 或密码才能解密平板电脑"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"您每次开机时都需要输入数字 PIN 或密码才能解密手机"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，需要确保电池有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，会丢失部分或全部数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密手机后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，需要确保电池有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，请务必确保电池有电，并且在加密完成前必须一直连接电源。如果中断了加密过程，可能会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密手机后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，请务必确保电池有电，并且在加密完成前必须一直连接电源。如果中断了加密过程，可能会丢失部分或全部数据。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密平板电脑"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"请为电池充电，然后重试。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"插上充电器，然后重试。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"没有锁定屏幕 PIN 或密码"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"您必须先设置锁定屏幕 PIN 或密码才能开始加密过程。"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您需要先设置锁定屏幕 PIN 或密码才能开始加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"确认加密"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"要加密平板电脑吗？此操作不可逆，如果您中断该过程，则会丢失数据。加密过程需要一个小时或更长时间，在此期间，平板电脑会重新启动数次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"要加密手机吗？此操作不可逆，如果您中断该过程，则会丢失数据。加密过程需要一个小时或更长时间，在此期间，手机会重新启动数次。"</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒后重试。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"键入密码"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"加密过程中断，无法完成。因此，您无法再访问平板电脑上的数据了。"\n\n"要继续使用您的平板电脑，必须将其恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"加密过程中断，无法完成。因此，您无法再访问手机上的数据了。"\n\n"要继续使用您的手机，必须将其恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断，无法完成。因此，您已无法再使用平板电脑上的数据。"\n\n"要继续使用您的平板电脑，您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断，无法完成。因此，您已无法再使用手机上的数据。"\n\n"要继续使用您的手机，您需要恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"选择屏幕锁定"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"无"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"滑动"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"人脸解锁"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"使用图案设置安全保护"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"使用 PIN 进行保护"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"通过密码设置安全保护"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"图案"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"密码"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"关闭屏幕锁定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"删除解锁图案"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"删除解锁 PIN"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"音乐效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"铃声音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"静音时振动"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"振动和响铃"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"振动"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"默认通知"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"有通知时指示灯闪烁"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"铃声"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"手机未插入底座"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"附加底座的设置"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"未找到底座"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"您必须先将平板电脑插入基座才能设置基座音频。"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"您必须先将手机插入基座才能设置基座音频。"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"您需要先将平板电脑插入基座才能设置基座音频。"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"您需要先将手机插入基座才能设置基座音频。"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"插入基座提示音"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"将平板电脑插入或拔出基座时播放声音"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"将电话插入底座或拔出时发出声音"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"要清除所有个人信息和下载的应用程序吗？请注意，此操作无法撤消！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"绘制您的解锁图案"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"您必须绘制解锁图案才能确认恢复出厂设置。"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"您需要绘制解锁图案以确认要恢复出厂设置。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"“系统清除”服务不可用，因此未执行重置操作。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"要重置吗？"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"格式化 USB 存储设备"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"要清空该 SD 卡（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"清除全部内容"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"绘制您的解锁图案"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"您必须绘制解锁图案，以确认对 USB 存储设备执行格式化操作。"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"您必须绘制解锁图案，以确认对 SD 卡执行格式化操作。"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您需要绘制解锁图案以确认要清空 USB 存储设备。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"您需要绘制解锁图案以确认要清空 SD 卡。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通话设置"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"设置语音信箱、来电转接、来电等待和本机号码显示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 共享网络"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"保护您的平板电脑"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"创建个人屏幕解锁图案可防止他人未经许可使用您的平板电脑。用手指按任意顺序连接下一屏幕上的点，但至少要连接四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"创建个人屏幕解锁图案可防止他人未经许可使用您的手机。在下一屏幕上用手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"创建个人屏幕解锁图案可防止他人未经许可使用您的手机。在下一屏幕上滑动手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用程序"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用程序"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"大号字体"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"按“电源”按钮结束通话"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"说出密码"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"触摸浏览"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"当“触摸浏览”功能打开时，您可以听到或看到您触摸内容的说明。"\n\n"此功能适用于视力不好的用户。"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"触摸和按住延迟"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安装任何服务"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要屏幕阅读器吗？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"“话语提示”可提供语音反馈以帮助盲人和有视力障碍的用户。您要通过 Android 电子市场免费安装该服务吗？"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"要安装网页脚本吗？"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允许应用程序安装来自 Google 的脚本，以便于您浏览这些应用程序的网页内容吗？"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"此功能会更改您的设备对触摸的响应方式。要打开吗？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"凭据存储已删除。"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"系统无法清除凭据存储。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"必须设置一个锁屏 PIN 或密码，然后才能使用凭据存储。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您需要先设置锁定屏幕 PIN 或密码才能使用凭据存储。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"备份和重置"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec 预共享密钥"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec 用户证书"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA 证书"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec 服务器证书"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"显示高级选项"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS 搜索域"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS 服务器（例如 8.8.8.8）"</string>
@@ -1535,7 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"保存帐户信息"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"（未使用）"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"（不验证服务器）"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"（来自服务器）"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"取消"</string>
     <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"连接"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"完成"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"跳过教程"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"第 1 课：浏览屏幕"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"打开“触摸浏览”功能后，您可以触摸屏幕以了解手指触摸处的组件。例如，当前屏幕中包含应用程序图标，您可以触摸屏幕，然后随意滑动手指，找出其中某个应用程序。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"打开“触摸浏览”功能后，您可以触摸屏幕以了解手指触摸处的组件。例如，当前屏幕中包含应用程序图标，您可以触摸屏幕，然后随意滑动手指，找出其中某个应用程序。"</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"做得不错！请继续在屏幕上随意滑动您的手指，至少再找到一个图标。"</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"要激活您正触摸的应用程序，只需点按一下即可。滑动您的手指，直到找到“<xliff:g id="APP_NAME">%s</xliff:g>”的图标，然后点按一下该图标即可将其激活。"</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"您的手指正在触摸“<xliff:g id="APP_NAME">%s</xliff:g>”图标。点按一下即可激活该图标。"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 2394270..6d3e747 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"卸除式 SD 卡"</item>
     <item msgid="4498124044785815005">"讓系統決定"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"關閉"</item>
-    <item msgid="4804571292609523335">"震動"</item>
-    <item msgid="595707141547423573">"靜音"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"一律"</item>
+    <item msgid="6293147072807231256">"永遠不要"</item>
+    <item msgid="1276641209451816572">"僅在靜音模式時震動"</item>
+    <item msgid="8418930333779132418">"僅適用於非靜音模式"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bb0c36f..dd04d4d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"確定"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"您所輸入的主機名稱無效。"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"您所輸入的排除清單格式有誤，請輸入以英文逗點分隔的排除網域清單。"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必須輸入連接埠欄位。"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"您必須填寫通訊埠欄位。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"若主機欄位空白，連接埠欄位也須空白。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"您所輸入的通訊埠無效。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定。"</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"每次平板電腦開機後，需輸入數字 PIN 或密碼才能對平板電腦解密。"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"每次手機開機後，需輸入數字 PIN 或密碼才能對手機解密。"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"您可以將帳戶、設定、已下載的應用程式資料、媒體和其他檔案內容予以加密。加密保護平板電腦之後，每次開機都需輸入解密用的數字 PIN 或密碼。如要解除加密狀態，必須恢復原廠設定，但這樣會清除平板電腦中的所有資料。"\n\n"加密作業可能超過 1 個小時。加密前請將平板電腦的電池充滿，而且加密完成前切勿拔除電源。加密作業若遭中斷，會造成資料遺失。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"您可以將帳戶、設定、已下載的應用程式資料、媒體和其他檔案內容予以加密。加密保護手機之後，每次開機都需輸入解密用的數字 PIN 或密碼。如要解除加密狀態，必須恢復原廠設定，但這樣會清除手機中的所有資料。"\n\n"加密作業可能超過 1 個小時。加密前請將手機的電池充滿，而且加密完成前切勿拔除電源。加密作業若遭中斷，會造成資料遺失。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"您可以針對帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將平板電腦加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除平板電腦上的所有資料。"\n\n"加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓平板電腦持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"您可以針對帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將手機加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除手機上所有的資料。"\n\n"加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓手機持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密保護平板電腦"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"對手機進行加密"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"將電池充電，然後再試一次。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"連接充電器，再試一次。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"沒有鎖定螢幕的 PIN 或密碼"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"在進行加密前，您必須設定鎖定螢幕的 PIN 或密碼。"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您必須先設定鎖定螢幕的 PIN 或密碼，才能開始加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"確認加密"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"要加密保護平板電腦嗎？加密後無法取消，而且中斷加密作業會造成資料遺失。加密作業可能超過 1 小時，加密過程中平板電腦會重新啟動數次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"要對手機進行加密嗎？您無法取消這個操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的手機會在過程中重新啟動數次。"</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒內再試一次。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"輸入密碼"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"加密過程中斷且未完成，因此您無法繼續存取平板電腦上的資料。"\n\n"如要繼續使用平板電腦，您必須恢復平板電腦的原廠設定。完成重設後，您可以在設定平板電腦時將先前備份至「Google 帳戶」的任何資料還原。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"加密過程中斷且未完成，因此您無法繼續存取手機上的資料。"\n\n"如要繼續使用手機，您必須恢復手機的原廠設定。完成重設後，您可以在設定手機時將先前備份至「Google 帳戶」的任何資料還原。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密過程中斷，無法完成，因此您再也不能存取平板電腦上的資料。"\n\n"如要恢復使用平板電腦，請先將平板電腦重設回原廠設定。完成重設後，您可以在設定平板電腦時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密過程中斷，無法完成，因此您再也不能存取手機上的資料。"\n\n"如要恢復使用手機，請先將手機重設回原廠設定。完成重設後，您可以在設定手機時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"選擇螢幕鎖定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"選擇備份解鎖方式"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"滑動"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"臉部辨識解鎖"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"以解鎖圖形設定安全保護"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"以 PIN 設定安全保護"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"以密碼設定安全保護"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"圖形"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"密碼"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"關閉螢幕鎖定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"移除解鎖圖形"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"移除解鎖 PIN"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"音樂效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"鈴聲音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"震動和鈴聲"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"震動"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"預設通知"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"手機未固定至座架"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"隨附的座架設定"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"找不到座架"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"您必須先將平板電腦安置於座架上，才能設定座架音效。"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"您必須先將手機安置於座架上才能設定座架音效。"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"您必須先將平板電腦安置於座架上，才能設定座架音效。"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"您必須先將手機安置於座架上，才能設定座架音效。"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"座架插入音效"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"將平板電腦置入座架或移出座架時播放音效"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"手機插入底座或離開底座時播放音效"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這個動作！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"畫出解鎖圖形"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"您必須畫出解鎖圖形，以確認恢復原廠設定。"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"請畫出解鎖圖形，確認您要恢復原廠設定。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"無法使用 System Clear 服務，因此未執行任何重設。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"您要重設嗎？"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"清除 USB 儲存裝置"</string>
@@ -838,8 +838,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"清除 SD 卡時，是否刪除其中儲存的所有檔案？這項動作無法復原！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"全部清除"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"畫出解鎖圖形"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"您必須繪製解鎖圖形，以確認要清除 USB 儲存裝置。"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"您必須繪製解鎖圖形，以確認要清除 SD 卡。"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖形以確認要清除 USB 儲存裝置的資料。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"請畫出解鎖圖形，確認您要清除 SD 卡中的資料。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及本機號碼顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網路共用"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"保護平板電腦的安全"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"手機安全設定"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"建立個人螢幕解鎖圖形，避免有人擅自使用您的平板電腦。在下個畫面中，用手指任意連結螢幕中的點，至少連結四個點。"\n\n"準備開始了嗎？請輕觸 [下一步]。"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"建立個人螢幕解鎖圖形，避免有心人士未經授權即擅自使用您的平板電腦。在下個畫面中，滑動手指任意連結螢幕中至少 4 個點。"\n\n"準備開始了嗎？請輕觸 [下一步]。"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"建立個人螢幕解鎖圖形，避免他人未經授權擅自使用您的手機。請在下一個畫面中，滑動手指任意連接至少四個點。"\n\n"準備開始了嗎？請輕觸 [下一步]。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和移除已安裝的應用程式"</string>
@@ -1158,8 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"系統"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"大字體"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"電源鍵可結束通話"</string>
-    <!-- no translation found for accessibility_speak_password_title (3344423945644925355) -->
-    <skip />
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"輕觸探索"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"開啟 [輕觸探索] 時，您就能聽到或看到您手指觸碰到的描述。"\n\n"這項功能是專為視力不佳的使用者而設計的。"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"輕觸並按住的延遲時間"</string>
@@ -1180,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要螢幕閱讀器嗎？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供語音回應功能協助視障或視力不佳的使用者。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"安裝網路指令碼？"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允許應用程式安裝 Google 提供的指令碼，讓其網路內容更容易存取嗎？"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"這項功能會變更裝置回應觸控的方式，確定要開啟嗎？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
@@ -1329,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"憑證儲存空間已清除。"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"無法清除認證儲存空間。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用認證儲存空間。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用憑證儲存空間。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"備份與重設"</string>
@@ -1444,7 +1441,7 @@
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 檢查"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"設定 HDCP 檢查行為"</string>
     <string name="debug_ui_category" msgid="9023948280291055349">"使用者介面"</string>
-    <string name="strict_mode" msgid="1938795874357830695">"嚴格模式已啟用"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"高安全性模式已啟用"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"當應用程式在主執行緒中進行長時間作業時，讓螢幕閃爍"</string>
     <string name="pointer_location" msgid="6084434787496938001">"指標位置"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"觸控時在螢幕上方顯示相關資料"</string>
@@ -1526,8 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec 預先共用金鑰"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec 使用者憑證"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA 憑證"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
     <string name="vpn_show_options" msgid="7182688955890457003">"顯示進階選項"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS 搜尋網域"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS 伺服器 (例如 8.8.8.8)"</string>
@@ -1537,8 +1532,6 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"儲存帳戶資訊"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(未使用)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(不要驗證伺服器)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
     <string name="vpn_cancel" msgid="1979937976123659332">"取消"</string>
     <string name="vpn_save" msgid="4233484051644764510">"儲存"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"連線"</string>
@@ -1562,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"完成"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"略過教學課程"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"第 1 課：畫面"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"開啟「輕觸探索」後，您可以輕觸螢幕來瞭解手指所碰觸的項目。例如，目前的畫面包含各種應用程式的圖示，您可以輕觸螢幕並用手指四處滑動，找出其中一個應用程式。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"開啟「輕觸探索」時，您可以輕觸螢幕來瞭解手指所碰觸的項目。例如，目前的畫面包含各種應用程式的圖示，您可以輕觸螢幕並用手指四處滑動，找出其中一個應用程式。"</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"很好！請繼續用手指在螢幕上四處滑動，至少再找到一個圖示為止。"</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"如要啟用您輕觸的應用程式，只要輕按即可。滑動您的手指，直到找到 <xliff:g id="APP_NAME">%s</xliff:g> 的圖示為止，然後輕按圖示一次，即可啟用應用程式。"</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"您的手指正輕觸 <xliff:g id="APP_NAME">%s</xliff:g> 圖示。輕按一下即可啟用圖示。"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 624cfe8..343db07 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -211,10 +211,11 @@
     <item msgid="3738430123799803530">"Khipha ikhadi le-SD"</item>
     <item msgid="4498124044785815005">"Vumela isistimu inqume"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Valiwe"</item>
-    <item msgid="4804571292609523335">"Dlidliza"</item>
-    <item msgid="595707141547423573">"Thulisa"</item>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Njalo"</item>
+    <item msgid="6293147072807231256">"Akusoze"</item>
+    <item msgid="1276641209451816572">"Kwimodi Ethulile kuphela"</item>
+    <item msgid="8418930333779132418">"Kuphela lapho ingekho kwimodi Ethulile"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kufushane"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9739403..5dced2f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"KULUNGILE"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Igama lomethuleli olithayiphile alilungile."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Uhlu lokukhishwayo oluthayiphile alufomethiwe kahle. Sicela ufake uhlu oluhlukaniswe ngofeleba lwezizinda ezingahlanganisiwe"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Kumelwe ugcwalise inkundla yembobo."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Udinga ukugcwalisa inkambu yentunja."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Inkundla yembobo kumelwe ingabi nalutho uma inkundla yesikhungo ingenalutho."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Imbobo oyithayiphile ayilungile."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</string>
@@ -246,9 +246,9 @@
     <string name="language_picker_title" msgid="5349877711342869319">"Ulimi"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Khetha okwenziwayo"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Ulwazi lwedivaysi"</string>
-    <string name="battery_info_label" msgid="4132685016148679403">"Ulwazi lebhetri"</string>
+    <string name="battery_info_label" msgid="4132685016148679403">"Ukwaziswa kwebhetri"</string>
     <string name="display_label" msgid="8074070940506840792">"Isikrini"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Ulwazi lethebhulethi"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Ukwaziswa kwethebhulethi"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Ulwazi lwefoni"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Isitoreji se-USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Ikhadi le-SD"</string>
@@ -291,7 +291,7 @@
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Enza kangcono ukufana kobuso"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Ivalwe ngokuzenzakalelayo"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> ngemuva kokulala"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Bonisa ulwazi lomnikazi ekuvaleni isikrini"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Bonisa ukwaziswa komnikazi ekuvaleni isikrini"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Imininingwane yomnikazi"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Faka umbhalo wokubonisa kwisikrini sokuvala"</string>
@@ -306,14 +306,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Dinga i-PIN yenombolo noma iphasiwedi ukubonisa umbhalo wemfihlo kwithebhulethi ngazo zonke izikhathi lapho uyivula"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Dinga i-PIN yenombolo noma iphasiwedi ukungabhali ngemfihlo ifoni yakho njalo lapho uyivula"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Betheliwe"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Ungabhala ngemfihlo ama-akhawunti, izilungiselelo, izinhlelo zokusebenza ezilandiwe kanye nenye idatha, kanye namafayela. Emva kokuba ubhale ngemfihlo ithebhulethi yakho, ngeke ukwazi ukuyishintsha ngaphandle kokwenza ukuhlela kabusha kwemboni, okwesula yonke idatha kwithebhulethi yakho."\n\n"Ukubhala ngemfihlo kungathatha ihora noma ngaphezulu. Kumele uqale ngebhetri eshajiwe futhi ugcine ithebhulethi ixhunyiwe kuze kube yilapho ukubhala ngemfihlo kuqedile. Uma uphazamisa inqubo yokubhala ngemfihlo, uzolahlekelwa idatha embalwa noma yiyo yonke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Ungabhala ngemfihlo ama-akhawunti, izilungiselelo, izinhlelo zokusebenza ezilandiwe kanye nenye idatha, kanye namafayela. Emva kokuba ubhale ngemfihlo ithebhulethi yakho, ngeke ukwazi ukuyishintsha ngaphandle kokwenza ukuhlela kabusha kwemboni, okwesula yonke idatha kwithebhulethi yakho."\n\n"Ukubhala ngemfihlo kungathatha ihora. Kumele uqale ngebhetri eshajiwe futhi ugcine ithebhulethi ixhunyiwe kuze kube yilapho ukubhala ngemfihlo kuqedile. Uma uphazamisa inqubo yokubhala ngemfihlo, uzolahlekelwa idatha embalwa noma yiyo yonke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="388628691961985052">"Ungabhala ngekhodi ama-akhawunti wakho, izilungiselelo, ulande ama-apps nadatha yawo, imidiya, namanye amafayela. Uma usubhale ngekhodi ikhompyutha yakho, udinga ukuthayipha i-PIN yenombolo noma iphasiwedi ukususa ukubhala ngekhodi ngaso isikathi ukhanyisa: awukwazi ukususa ukubhala ngakhodi ikhompyutha yakho ngaphandle kokwenza kabusha idatha yakho yenkampani, sula yonke idatha yakho."\n\n"Ukubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe futhi ugcine ikhompyutha yakho iplakiwe kuze kuphele ukubhala ngakhodi. Uma uphazamisa inqubo yokubhala ngekhodi, uzolahlekelwa enye noma yonke idatha yakho."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7707298558618842459">"Ungabhala ngakhodi ama-akhawunti wakho, izilungiselelo, ulande ama-apps nedatha yawo, imidiya namanye amafayela. Uma usubhale ngekhodi ucingo lakho, udinga ukuthayipha i-PIN yezinombolo noma iphasiwedi ukususa ukubhala ngakhodi ngaso sonke isikhathi uma uyikhanyisa: awukwazi ukususa ukubhala ngekhodi ucingo lakho ngaphandle kokwenza ukusetha kabusha idatha yenkampani, ususe yonke idatha yakho."\n\n"Ukubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhitri elishajiwe futhi ugcine ucingo lakho luplakiwe kuze ukubhala ngekhodi kuqedele. Uma uphazamisa inqubo yokubhala ngekhodi, uzolahlekelwa enye noma yonke idatha yakho."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Bethela ifoni"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Sicela ushaje ibhetri yakho bese uzama futhi."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sicela uxhume ishaja yakho bese uzama futhi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ayikho i-PIN yokuvala isikrini noma iphasiwedi"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Kumele umise ukuvala i-PIN yesikrini noma iphasiwedi ngaphambi kokuqalisa umbhalo wemfihlo."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Udinga ukusetha i-PIN yokukhiya isikrini noma iphasiwedi ngaphambi kokuqala ukubhala ngakhodi."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Qinisekisa umbhalo wemfihlo"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Bethela ithebhulethi? Lo msebenzi awushintsheki futhi uma uwuphazamaisa, uzolahlekelwa idatha. Ukubhala ngemfihlo kuthatha ihora noma ngaphezulu, phakathi nalapho ithebhulethi izoqalisa phansi izikhathi ezimbalwa."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Bethela ifoni? Lo msebenzi awushintsheki futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngemfihlo kuthatha ihora noma ngaphezulu, phakathi nalapho ifoni izo qala phansi izikhathi ezimbalwa."</string>
@@ -323,8 +323,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zama futhi emasekhondini angu-<xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Thayipha iphasiwedi yakho"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Ubhala ngokufihlekileyo akuphumelelanga"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Ukubethela kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha ekuthebhulethi yakho. "\n\n"Ukuze uphinde usebenzise ithebhulethi yakho, kufanele isethwe kabusha. Uma ususetha ithebhulethi yakho emuva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. "\n\n"Ukuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esekhompyutheni yakho yepeni. "\n\n"Ukuze uphinde usebenzise ikhompyutha yakho yepeni, kufanele isethwe kabusha endaweni yokukhanda. Uma ususetha ikhompyutha yakho yepeni emva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google.."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. "\n\n"Ukuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
     <string name="lock_settings_picker_title" msgid="3332098786253116023">"Khetha ukukhiya isikrini"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Khetha ukukhiywa kokulondoloza"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Isikrini sivaliwe."</string>
@@ -348,9 +348,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Lutho"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Islayidi"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Vula Ngobuso"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Ivikelwe ngephathini"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Ivikelwe nge-PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Ivikelwe ngephasiwedi"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Iphathini"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Iphasiwedi"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Cima ukuvala isikrini"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Khipha iphathini yokuvula"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Khipha ukuvala i-PIN"</string>
@@ -499,7 +499,7 @@
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Isaziso senethiwekhi"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Ngazise lapho inethiwekhi evulekile itholakala"</string>
     <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Gwema uxhumo olubi"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Ungasebenzisi inethiwekhi ye-Wi-Fi ngaphandle uma inoxhumano lwe-inthanethi olukahle."</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Ungasebenzisi uhleloxhumano lwe-Wi-Fi ngaphandle uma unohleloxhumano lwe-inthanethi olukahle."</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Gcina i-Wi-Fi isebenza ngenkathi ilele"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kube khona inkinga yokushintsha ilungiselelo"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Yengeza inethiwekhi"</string>
@@ -509,7 +509,7 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Guqula inethiwekhi"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ukubona amanethiwekhi atholakalayo, vula i-WiFi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ukubona uhleloxhumano olutholakalayo, vula Ukuxhumana kungenazintambo"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Bonisa okukhethwa kukho okuseqophelweni"</string>
     <string name="wifi_network_setup" msgid="2243277654809358812">"i-WPS"</string>
     <string name="wifi_wps_pin" msgid="8242979682530043184">"Thayipha i-PIN kusuka kwindayo yokungena"</string>
@@ -569,7 +569,7 @@
     <string name="wifi_gateway" msgid="163914742461092086">"Indlela yokuphuma"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ubude begama eliqalayo lenethiwekhi"</string>
     <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"I-WiFi Eqondile"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Setha uxhumano peer-to-peer"</string>
+    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Setha uhleloxhumano lwe- peer-to-peer"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Imininingwane yedivayisi"</string>
     <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Isethaphu Evikelwe Yokuxhumana kungenazintamnbo"</string>
     <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Thayipha iphinikhodi"</string>
@@ -594,7 +594,7 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Imphumelo Yomculo"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ivolumu yesikhali"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Idlidliza uma ithulile"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Dlidlizisa futhi kukhale"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Dlidliza"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Isaziso esizenzakalelayo"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Ukukhanya kwesaziso sephalsi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Iringithoni"</string>
@@ -623,8 +623,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Ifoni edokhiwe"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Izilungiselelo zokudokha okunamathiselwe"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Ukudokha akutholiwe"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Kumele wenze i-dock ye-tablet yakho ukuze usethe i-dock audio."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Kumele wenze i-dock yeselula yakho ukuze usethe i-dock audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Udinga ukufaka idoki kukhompyutha yakho ngaphambi kokusetha umsindo wedoki"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Udinga ukungenisa edokini ucingo ngaphambi kokusetha umsindo wedoki."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dokha ingxenye umsindo wokufaka"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Dlala umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Dlala umsindo lapho ufaka noma ukhipha ifoni kudokhi"</string>
@@ -692,7 +692,7 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Akutholakali"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Isimo"</string>
     <string name="device_status" msgid="607405385799807324">"Isimo"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Isimo sebhetri, inethiwekhi, nolunye ulwazi"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Isimo sebhetri, inethiwekhi, nokunye ukwaziswa"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Inombolo yocingo, isiginali, nokunye."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Isitoreji"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Izilungiselelo zesitoreji"</string>
@@ -823,7 +823,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Susa yonkr imininingwane yomuntu kanye nezinhlelo zokusebenza ezilayishiwe? Ngeke ukwazi ukuguqula lokhu!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Sula yonke into"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dweba iphathini yakho yokuvula"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Kumelwe udwebe iphathini yakho yokuvula ukuqinisekisa ukusetha kabusha idatha."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Udinga ukudweba iphethini yakho yokuvula ukuqinisekisa ukwenza kabusha idatha yonkampani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Akukho ukusetha kabusha okwenziwe ngoba isevisi Yokwesula Isistimu ayitholakali."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setha kabusha"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Sula isitoreji se-USB"</string>
@@ -838,14 +838,14 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Sula ikhadi le-SD, isula wonke amafayela agcinwe lapho? Isinyathelo asikwazi ukuguqulwa!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Sula yonke into"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dweba iphathini yokuvula"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuthi ufuna ukusula isitoreji se-USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuba ufuna ukusula ikhadi le-SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuthi ufuna ukusula isitoreji se-USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuba ufuna ukusula ikhadi le-SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Izilungiselelo zekholi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hlela ivoyisimeyili, ukudlulisa ikholi, ikholi elindile, i-ID yomshayeli"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Imodemu nge-USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Indawo ephathekayo"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Imodemu nge-Bluetooth"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ukusebenzisa njengemodemu"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ukusebenzisa ifoni njengemodemu"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"Ukusebenzisa njengemodemu &amp; indawo ephathekayo"</string>
     <string name="usb_title" msgid="7483344855356312510">"I-USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Imodemu nge-USB"</string>
@@ -881,7 +881,7 @@
     <string name="use_location_summary" msgid="3978805802386162520">"Vumela i-Google isebenzise indawo yakho ukuthuthukisa imiphumela yosesho kanye namanye amasevisi."</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Mayelana nethebhulethi"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Mayelana nefoni"</string>
-    <string name="about_settings_summary" msgid="3371517697156165959">"Buka ulwazi lomthetho, umumo wefoni, inguqulo yesofthiwe"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Buka ukwaziswa komthetho, umumo wefoni, inguqulo yesofthiwe"</string>
     <string name="legal_information" msgid="5769301644270604095">"Uwazi olusemthethweni"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Abanikeli"</string>
     <string name="copyright_title" msgid="865906688917260647">"I-copyright"</string>
@@ -936,7 +936,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Okulandelayo"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ivikela ithebhulethi yakho"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Ukuphepha kwefoni yakho"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Vikela ithebhulethi yakho ekusetshenzisweni okungavumelekile ngokwenza iphathini yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma amachashazi nganoma yikuphi ukuhleleka kwsikrini esilandelayo. Kumele uxhume okungenani amachashazi amane. "\n\n"Ukulungele ukuqalisa? Thinta \"Okulandelayo\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Vikela ithebhulethi yakho ekusetshenzisweni okungavumelekile ngokwenza iphathini yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma amachashazi nganoma yikuphi ukuhleleka kwsikrini esilandelayo. Kumele uxhume okungenani amachashazi amane. "\n\n"Ukulungele ukuqalisa? Thinta \"Okulandelayo\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Vikela ifoni yakho ekusetshenzisweni okungemthotho ngokwakha iphethini yakho siqu yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma okungenani amadothi amane kusikrini sombhalo. "\n\n"Usukulungele ukuqala? Thinta Okulandelayo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Phatha izinhlelo zokusebenza"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Phatha futhi ukhiphe izinhlelo zokusebenza ezifakiwe"</string>
@@ -1097,9 +1097,9 @@
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Awunawo amagama kwisichazamazwi somsebenzisi. Ungafaka igama ngokuthinta Faka (+) inkinobho."</string>
     <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Zonke izilimi"</string>
     <string name="testing" msgid="6584352735303604146">"Iyahlola"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Ulwazi lethebhulethi"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Ukwaziswa kwethebhulethi"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Ulwazi lwefoni"</string>
-    <string name="testing_battery_info" msgid="3497865525976497848">"Ulwazi lebhetri"</string>
+    <string name="testing_battery_info" msgid="3497865525976497848">"Ukwaziswa kwebhetri"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Ukuqalisa okusheshayo"</string>
     <string name="quick_launch_summary" msgid="8101133819188001190">"Setha izinqamuleli zekhibhodi ukuqalisa izinhlelo zokusebenza"</string>
     <string name="quick_launch_assign_application" msgid="6240064079456617501">"Beka uhlelo lokusebenza"</string>
@@ -1158,7 +1158,6 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Isistimu"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Umbalo omkhulu"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Inkinobho yamandla imisa ikholi"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Memeza iphasiwedi"</string>
     <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Hlaziya ngokuthinta"</string>
     <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Lapho Ukuhlola Ngokuthinta kuvuliwe, ungezwa noma ubone izincazelo zalokho okungaphansi komunwe wakho"\n\n" Lesi sici esabasebenzisi abangaboni kahle."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Ukulibaziseka uma uthinta, ubamba"</string>
@@ -1179,7 +1178,6 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ayikho isevisi efakiwe"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Udinga isifundi skrini?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"I-TalkBack inikeza usizo lokuphendula kwezi ukuze kusizakale abangaboni kanye nalabo ababona kancane. Ingabe uyafuna ukuyifaka mahhala uyithola Emaketheni ye-Android?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Faka imibhalo yewebhu"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ingabe ukuthi insiza ifake imibhalo ye-Google ezokwenza ukuthi okuqukethwe kwabo kutholakale kalula?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Lesi sici sishintsha indlela i-device yakho eyenza ngayo uma icindezelwa. Ivulwe?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Akukho ncazelo enikeziwe."</string>
@@ -1328,7 +1326,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Isitoreji sokuqinisekisa sisuliwe."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Ukulonda kokuqinisekia akwazanga ukusulwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Isitoreji sokuqinisekisa sivunyelwe."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Kumele usethe iphinikhodi noma iphasiwedi yokukhiya isikrini ngaphambi kokusebenzisa isitoreji sokuqinisekisa."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kumele usethe iphinikhodi noma iphasiwedi yokukhiya isikrini ngaphambi kokusebenzisa isitoreji sokuqinisekisa."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ithoni ephuthumayo"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sekela ngokulondoloza usethe kabusha"</string>
@@ -1365,7 +1363,7 @@
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Xhuma kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Ixhuma kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
     <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ixhunywe kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Engeza inethiwekhi"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Engeza uhleloxhumano"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Akuxhunyiwe"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Yengeza inethiwekhi"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Vuselela uhlu"</string>
@@ -1377,7 +1375,7 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"Khohlwa"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Londoloza"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Khansela"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Iskenela amanethiwekhi..."</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Iskena uhleloxhumano..."</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Thinta inethiwekhi ukuxhuma kuyo"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Xhuma kwinethiwekhi"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Xhuma kwinethiwekhi engavikelekile"</string>
@@ -1525,7 +1523,6 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Ukhiye owabelene ngaphambili we-IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Isitifiketi somsebenzisi we-IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Izitifiketi ze-IPSec CA"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec izitifiketi se-server"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Bonisa okukhethwa kukho okuseqophelweni"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Izizinda zokusesha ze-DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"amaseva e-DNS (e.g. 8.8.8.8)"</string>
@@ -1535,14 +1532,13 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"Lolondoloza ulwazi lwe-akhawunti"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ayisetshenziswa)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ungaqinisekisi isiphakeli)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(itholakale kwi-server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Khansela"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Londoloza"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Xhuma kwi-inthanethi"</string>
-    <string name="vpn_edit" msgid="1111459297288136079">"Hlela inethiwekhi ye-VPN"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Hlela uhleloxhumano lwe-VPN"</string>
     <string name="vpn_connect_to" msgid="7328758950427515753">"Xhuma kwi-<xliff:g id="NETWORK">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"I-VPN"</string>
-    <string name="vpn_create" msgid="8966010925994175306">"Engeza inethiwekhi ye-VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Engeza uhleloxhumano lwe-VPN"</string>
     <string name="vpn_menu_edit" msgid="4526245173583195618">"Hlela inethiwekhi"</string>
     <string name="vpn_menu_delete" msgid="3326527392609513129">"Susa inethiwekhi"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Isistimu"</string>
@@ -1559,7 +1555,7 @@
     <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Qeda"</string>
     <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Yeqa okokufundisa"</string>
     <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Isifundo 1: Ukuhlaziya isikrini"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Ngemuva kokuba ukhanyise u-\"Hlola ngokucindezela,\" ungathinta isikrini ukuze ufunde ukuthi yin …i engaphansi komunwe wakho. Isibonelo, isikrini samanje siqukethe izithonjana zohlelo lokusebenza. Thola esinye sazo ngokuthinta isikrini noma ngokuhambisa ngeminwe yakho."</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="8363960677225836782">"Uma i-Explore by Touch ikhanyiseiwe, ungathinta isikrini ukuze ufunde ukuthi yini okungaphansi komunwe wakho. Isibonelo, isikrini samanje sinezithonjana ze-app. Thola esisodwa ngokuthinta isikrini bese uhambise umunwe wakho."</string>
     <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Kuhle, Qhubeka nokuslayida umunwe wakho esikrinini kuze kube yilapho usuthole okungenani isithanya esisodwa"</string>
     <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Ukuze uqalise into oyithintayo. Slayida umunwe wakho uze uthole isithonjana se <xliff:g id="APP_NAME">%s</xliff:g>. Bese uthepha isithonjane kanye ukuze usiqalise."</string>
     <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Umunwe wakho uthinte <xliff:g id="APP_NAME">%s</xliff:g> isithonjana. Thepha kanye ukuvuselela isithonjana."</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9a29122..a5b9ba2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -282,12 +282,12 @@
     <!-- Notification title when a Bluetooth device wants to pair with us -->
     <string name="bluetooth_notif_title">Pairing request</string>
     <!-- Notification message when a Bluetooth device wants to pair with us -->
-    <string name="bluetooth_notif_message">Touch to pair with <xliff:g id="device_name">%1$s</xliff:g></string>
+    <string name="bluetooth_notif_message">Touch to pair with <xliff:g id="device_name">%1$s</xliff:g>.</string>
     <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
     <string name="bluetooth_show_received_files">Show received files</string>
 
     <!-- Strings for BluetoothDevicePicker -->
-    <string name="device_picker">Bluetooth device picker</string>
+    <string name="device_picker">Bluetooth device chooser</string>
 
     <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
     <string name="bluetooth_permission_request">"Bluetooth permission request"</string>
@@ -335,7 +335,7 @@
     <string name="bluetooth_phonebook_request">"Phone book request"</string>
 
     <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
-    <string name="bluetooth_pb_acceptance_dialog_text">%1$s would like to access your contacts and call history. Give access to %2$s?</string>
+    <string name="bluetooth_pb_acceptance_dialog_text">%1$s wants to access your contacts and call history. Give access to %2$s?</string>
 
     <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
     <string name="bluetooth_pb_remember_choice">Don\'t ask again</string>
@@ -402,7 +402,7 @@
     <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
     <string name="proxy_error_invalid_exclusion_list">The exclusion list you typed isn\'t properly formatted. Type a comma-separated list of excluded domains.</string>
     <!-- HTTP proxy settings. Error msg -->
-    <string name="proxy_error_empty_port">You must complete the port field.</string>
+    <string name="proxy_error_empty_port">You need to complete the port field.</string>
     <!-- HTTP proxy settings. Error msg -->
     <string name="proxy_error_empty_host_set_port">The port field must be empty if the host field is empty.</string>
     <!-- HTTP proxy settings. Error msg -->
@@ -487,25 +487,25 @@
     <string name="band_mode_succeeded">Successful</string>
 
     <!-- Instructions after the user changes the mass storage settings -->
-    <string name="sdcard_changes_instructions">Changes take effect when USB cable is reconnected</string>
+    <string name="sdcard_changes_instructions">Changes take effect when USB cable is reconnected.</string>
     <!-- Enable USB mass storage mode checkbox title -->
     <string name="sdcard_settings_screen_mass_storage_text">Enable USB mass storage</string>
     <!-- The label for total bytes on SD card -->
     <string name="sdcard_settings_total_bytes_label">Total bytes:</string>
     <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
-    <string name="sdcard_settings_not_present_status" product="nosdcard">USB storage not mounted</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard">USB storage not mounted.</string>
     <!-- Message when there is no SD card present -->
-    <string name="sdcard_settings_not_present_status" product="default">No SD card</string>
+    <string name="sdcard_settings_not_present_status" product="default">No SD card.</string>
     <!-- Th label for the available (free) sapce on the SD card -->
     <string name="sdcard_settings_available_bytes_label">Available bytes:</string>
     <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard">USB storage is being used as a mass storage device</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard">USB storage is being used as a mass storage device.</string>
     <!-- Message when the SD card is being used by the computer as mass storage -->
-    <string name="sdcard_settings_mass_storage_status" product="default">SD card is being used as a mass storage device</string>
+    <string name="sdcard_settings_mass_storage_status" product="default">SD card is being used as a mass storage device.</string>
     <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
-    <string name="sdcard_settings_unmounted_status" product="nosdcard">It\'s now safe to remove the USB storage</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard">It\'s now safe to remove the USB storage.</string>
     <!-- Message when it is safe to remove the SD card -->
-    <string name="sdcard_settings_unmounted_status" product="default">It\'s now safe to remove the SD card</string>
+    <string name="sdcard_settings_unmounted_status" product="default">It\'s now safe to remove the SD card.</string>
     <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
     <string name="sdcard_settings_bad_removal_status" product="nosdcard">USB storage was removed while still in use!</string>
     <!-- Error message when the SD card was removed without properly unmounting -->
@@ -517,9 +517,9 @@
     <!-- Message when it is scanning the SD card for new files -->
     <string name="sdcard_settings_scanning_status" product="default">Scanning SD card for media\u2026</string>
     <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
-    <string name="sdcard_settings_read_only_status" product="nosdcard">USB storage mounted read-only</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard">USB storage mounted read-only.</string>
     <!-- Message when the SD card is mounted as read only -->
-    <string name="sdcard_settings_read_only_status" product="default">SD card mounted read-only</string>
+    <string name="sdcard_settings_read_only_status" product="default">SD card mounted read-only.</string>
     <!-- SetupWizard strings used by DateTimeSettingsSetupWizard.  The button label for going to the next screen without storing the setting. [CHAR LIMIT=5] -->
     <string name="skip_label">Skip</string>
     <!-- SetupWizard strings used by DateTimeSettingsSetupWizard.  The button label for going to the next screen. -->
@@ -583,9 +583,9 @@
     <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
     <string name="roaming_turn_it_on_button">Turn it on</string>
     <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
-    <string name="roaming_warning">Allow data roaming? You may incur significant roaming charges!</string>
+    <string name="roaming_warning">When you allow data roaming, you may incur significant roaming charges!</string>
     <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
-    <string name="roaming_reenable_title">Attention</string>
+    <string name="roaming_reenable_title">Allow data roaming?</string>
     <!-- mobile network settings screen, setting option name -->
     <string name="networks">Operator selection</string>
     <!-- mobile network settings screen, setting option summary text -->
@@ -623,7 +623,7 @@
     <!-- Date & time setting screen setting option title -->
     <string name="date_time_set_date">Set date</string>
     <!-- Date & time setting screen setting option title.  This setting allows the user to choose how the date should be displayed in apps (what ordering for month and day, etc.) -->
-    <string name="date_time_date_format">Select date format</string>
+    <string name="date_time_date_format">Choose date format</string>
     <!-- Menu item on Select time zone screen -->
     <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string>
     <!-- Menu item on Select time zone screen -->
@@ -685,8 +685,8 @@
     <!-- Informational text in the first confirmation screen before starting device encryption -->
     <string name="crypt_keeper_desc" product="tablet">
     You can encrypt your accounts, settings, downloaded apps and their data,
-    media, and other files. Once you encrypt your tablet, you must enter a numeric PIN
-    or password to decrypt it each time you power it on: you can\'t unencrypt your tablet
+    media, and other files. Once you encrypt your tablet, you need to type a numeric PIN
+    or password to decrypt it each time you power it on. You can\'t decrypt your tablet
     except by performing a factory data reset, erasing all your data.\n\nEncryption takes
     an hour or more. You must start with a charged battery and keep your tablet plugged in
     until encryption is complete. If you interrupt the encryption process, you will lose
@@ -694,8 +694,8 @@
     <!-- Informational text in the first confirmation screen before starting device encryption -->
     <string name="crypt_keeper_desc" product="default">
     You can encrypt your accounts, settings, downloaded apps and their data,
-    media, and other files. Once you encrypt your phone, you must enter a numeric PIN or
-    password to decrypt it each time you power it on: you can\'t unencrypt your phone
+    media, and other files. Once you encrypt your phone, you need to type a numeric PIN or
+    password to decrypt it each time you power it on. You can\'t decrypt your phone
     except by performing a factory data reset, erasing all your data.\n\nEncryption takes
     an hour or more. You must start with a charged battery and keep your phone plugged in
     until encryption is complete. If you interrupt the encryption process, you will lose
@@ -714,19 +714,19 @@
     <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
     <string name="crypt_keeper_dialog_need_password_title">No lock screen PIN or password</string>
     <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
-    <string name="crypt_keeper_dialog_need_password_message">You must set a lock screen PIN or
+    <string name="crypt_keeper_dialog_need_password_message">You need to set a lock screen PIN or
     password before you can start encryption.</string>
 
     <!-- Title of the final confirmation screen before starting device encryption -->
-    <string name="crypt_keeper_confirm_title">Confirm encryption</string>
+    <string name="crypt_keeper_confirm_title">Encrypt?</string>
     <!-- Warning text in the final confirmation screen before starting device encryption -->
     <string name="crypt_keeper_final_desc" product="tablet">
-    Encrypt tablet? This operation is irreversible and if you interrupt it, you will lose data.
+    The encryption operation is irreversible and if you interrupt it, you\'ll lose data.
     Encryption takes an hour or more, during which the tablet will restart several times.
     </string>
     <!-- Warning text in the final confirmation screen before starting device encryption -->
     <string name="crypt_keeper_final_desc" product="default">
-    Encrypt phone? This operation is irreversible and if you interrupt it, you will lose data.
+    The encryption operation is irreversible and if you interrupt it, you\'ll lose data.
     Encryption takes an hour or more, during which the phone will restart several times.
     </string>
 
@@ -754,7 +754,7 @@
       Encryption was interrupted and can\'t complete. As a result, the data on
       your tablet is no longer accessible.
       \n\n
-      To resume using your tablet, you must perform a factory reset.
+      To resume using your tablet, you need to perform a factory reset.
       When you set up your tablet after the reset, you\'ll have an opportunity
       to restore any data that was backed up to your Google Account.
     </string>
@@ -763,7 +763,7 @@
     <string name="crypt_keeper_failed_summary" product="default">
       Encryption was interrupted and can\'t complete. As a result, the data on
       your phone is no longer accessible.
-      \n\nTo resume using your phone, you must perform a factory reset.
+      \n\nTo resume using your phone, you need to perform a factory reset.
       When you set up your phone after the reset, you\'ll have an opportunity
       to restore any data that was backed up to your Google Account.
     </string>
@@ -772,7 +772,7 @@
 
     <!-- Security Picker --><skip />
     <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
-    <string name="lock_settings_picker_title">Select screen lock</string>
+    <string name="lock_settings_picker_title">Choose screen lock</string>
 
     <!--  Title for security picker when choosing a facelock's backup unlock method: Pattern/PIN [CHAR LIMIT=22] -->
     <string name="backup_lock_settings_picker_title">Choose backup lock</string>
@@ -833,11 +833,11 @@
     <!-- Summary for "Configure lockscreen" when security biometric weak is enabled [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_biometric_weak">Face Unlock</string>
     <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_mode_pattern">Secured with pattern</string>
+    <string name="unlock_set_unlock_mode_pattern">Pattern</string>
     <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_mode_pin">Secured with PIN</string>
+    <string name="unlock_set_unlock_mode_pin">PIN</string>
     <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_mode_password">Secured with password</string>
+    <string name="unlock_set_unlock_mode_password">Password</string>
 
     <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
     <string name="unlock_disable_lock_title">Turn off screen lock</string>
@@ -868,66 +868,66 @@
     <string name="lockpassword_continue_label">Continue</string>
 
     <!-- Error shown in popup when password is too long -->
-    <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters</string>
+    <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters.</string>
     <!-- Error shown in popup when PIN is too long -->
-    <string name="lockpassword_pin_too_long">PIN must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits</string>
+    <string name="lockpassword_pin_too_long">PIN must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits.</string>
 
     <!-- Error shown when in PIN mode and user enters a non-digit -->
-    <string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9</string>
+    <string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9.</string>
 
     <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
-    <string name="lockpassword_pin_recently_used">Device administrator disallows using a recent PIN</string>
+    <string name="lockpassword_pin_recently_used">Device administrator doesn\'t allow using a recent PIN.</string>
 
     <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
-    <string name="lockpassword_illegal_character">Password contains an illegal character</string>
+    <string name="lockpassword_illegal_character">Password contains an illegal character.</string>
 
     <!-- Error shown when in PASSWORD mode and password is all digits -->
-    <string name="lockpassword_password_requires_alpha">Password must contain at least one letter</string>
+    <string name="lockpassword_password_requires_alpha">Password must contain at least one letter.</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
-    <string name="lockpassword_password_requires_digit">Password must contain at least one digit</string>
+    <string name="lockpassword_password_requires_digit">Password must contain at least one digit.</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
-    <string name="lockpassword_password_requires_symbol">Password must contain at least one symbol</string>
+    <string name="lockpassword_password_requires_symbol">Password must contain at least one symbol.</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
     <plurals name="lockpassword_password_requires_letters">
-        <item quantity="one">Password must contain at least 1 letter</item>
-        <item quantity="other">Password must contain at least %d letters</item>
+        <item quantity="one">Password must contain at least 1 letter.</item>
+        <item quantity="other">Password must contain at least %d letters.</item>
     </plurals>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
     <plurals name="lockpassword_password_requires_lowercase">
-        <item quantity="one">Password must contain at least 1 lowercase letter</item>
-        <item quantity="other">Password must contain at least %d lowercase letters</item>
+        <item quantity="one">Password must contain at least 1 lowercase letter.</item>
+        <item quantity="other">Password must contain at least %d lowercase letters.</item>
     </plurals>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
     <plurals name="lockpassword_password_requires_uppercase">
-        <item quantity="one">Password must contain at least 1 uppercase letter</item>
-        <item quantity="other">Password must contain at least %d uppercase letters</item>
+        <item quantity="one">Password must contain at least 1 uppercase letter.</item>
+        <item quantity="other">Password must contain at least %d uppercase letters.</item>
     </plurals>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
     <plurals name="lockpassword_password_requires_numeric">
-        <item quantity="one">Password must contain at least 1 numerical digit</item>
-        <item quantity="other">Password must contain at least %d numerical digits</item>
+        <item quantity="one">Password must contain at least 1 numerical digit.</item>
+        <item quantity="other">Password must contain at least %d numerical digits.</item>
     </plurals>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
     <plurals name="lockpassword_password_requires_symbols">
-        <item quantity="one">Password must contain at least 1 special symbol</item>
-        <item quantity="other">Password must contain at least %d special symbols</item>
+        <item quantity="one">Password must contain at least 1 special symbol.</item>
+        <item quantity="other">Password must contain at least %d special symbols.</item>
     </plurals>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
     <plurals name="lockpassword_password_requires_nonletter">
-        <item quantity="one">Password must contain at least 1 non-letter character</item>
-        <item quantity="other">Password must contain at least %d non-letter characters</item>
+        <item quantity="one">Password must contain at least 1 non-letter character.</item>
+        <item quantity="other">Password must contain at least %d non-letter characters.</item>
     </plurals>
 
     <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
-    <string name="lockpassword_password_recently_used">Device administrator disallows using a recent password</string>
+    <string name="lockpassword_password_recently_used">Device administrator doesn\'t allow using a recent password.</string>
 
     <!-- Label for ChoosePassword/PIN OK button -->
     <string name="lockpassword_ok_label">OK</string>
@@ -942,7 +942,7 @@
     <string name="lockpattern_tutorial_continue_label">Next</string>
 
     <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
-    <string name="lock_setup" msgid="5507462851158901718">Setup complete</string>
+    <string name="lock_setup" msgid="5507462851158901718">Setup is complete.</string>
 
     <!-- In the security screen, the header title for settings related to device admins -->
     <string name="device_admin_title">Device administration</string>
@@ -987,9 +987,9 @@
     <string name="bluetooth_pin_values_hint">Usually 0000 or 1234</string>
 
     <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_enter_pin_other_device">You may also need to enter this PIN on the other device.</string>
+    <string name="bluetooth_enter_pin_other_device">You may also need to type this PIN on the other device.</string>
     <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_enter_passkey_other_device">You may also need to enter this passkey on the other device.</string>
+    <string name="bluetooth_enter_passkey_other_device">You may also need to type this passkey on the other device.</string>
 
     <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
     <string name="bluetooth_confirm_passkey_msg">To pair with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Make sure it is showing this passkey:&lt;br>&lt;b><xliff:g id="passkey">%2$s</xliff:g>&lt;/b></string>
@@ -1018,7 +1018,7 @@
     <string name="bluetooth_pairing_rejected_error_message">Pairing rejected by <xliff:g id="device_name">%1$s</xliff:g>.</string>
 
     <!-- Message for the error dialog when BT connecting operation fails generically. -->
-    <string name="bluetooth_connecting_error_message">There was a problem connecting to <xliff:g id="device_name">%1$s</xliff:g>.</string>
+    <string name="bluetooth_connecting_error_message">Couldn\'t connect to <xliff:g id="device_name">%1$s</xliff:g>.</string>
 
     <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
     <string name="bluetooth_preference_scan_title">Scan for devices</string>
@@ -1218,7 +1218,7 @@
     <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=75] -->
     <string name="wifi_wps_in_progress">WPS is already in progress and can take tens of seconds to complete</string>
     <!-- Text displayed when WPS fails to start [CHAR LIMIT=75] -->
-    <string name="wifi_wps_failed">Couldn\'t start WPS, try again.</string>
+    <string name="wifi_wps_failed">Couldn\'t start WPS. Try again.</string>
     <!-- Label for the SSID of the network -->
     <string name="wifi_ssid">Network SSID</string>
     <!-- Label for the security of the connection -->
@@ -1375,23 +1375,25 @@
 
     <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
     <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
-    <string name="wifi_p2p_settings_title">Wi-Fi direct</string>
-    <!-- Summary for Wi-fi Direct settings item in the 1st-level settings screen [CHAR LIMIT=50]-->
-    <string name="wifi_p2p_settings_summary">Set up peer-to-peer connectivity</string>
+    <string name="wifi_p2p_settings_title">Wi-Fi Direct</string>
     <string name="wifi_p2p_device_info">Device information</string>
-    <string name="wifi_p2p_wps_setup">Wi-Fi protected setup</string>
-    <string name="wifi_p2p_wps_pin">Type PIN</string>
     <string name="wifi_p2p_persist_network">Remember this connection</string>
     <!-- Menu option to discover peers-->
-    <string name="wifi_p2p_menu_search">Search</string>
-    <!-- Menu option to create a group-->
-    <string name="wifi_p2p_menu_create_group">Create group</string>
-    <!-- Menu option to remove a group-->
-    <string name="wifi_p2p_menu_remove_group">Remove group</string>
-    <!-- Menu option to Wi-Fi p2p advanced settings -->
-    <string name="wifi_p2p_menu_advanced">Advanced</string>
+    <string name="wifi_p2p_menu_search">SEARCH FOR DEVICES</string>
+    <!-- Menu option when discovery is in progress-->
+    <string name="wifi_p2p_menu_searching">SEARCHING</string>
+    <!-- Menu option to Rename-->
+    <string name="wifi_p2p_menu_rename">Rename device</string>
     <!-- Title for available p2p devices -->
-    <string name="wifi_p2p_available_devices">Available devices</string>
+    <string name="wifi_p2p_peer_devices">PEER DEVICES</string>
+    <!-- Toast text for a failed connection initiation -->
+    <string name="wifi_p2p_failed_connect_message">Couldn\'t connect.</string>
+    <!-- Title for disconnect dialog -->
+    <string name="wifi_p2p_disconnect_title">Disconnect?</string>
+    <!-- Message test for disconnection from one device-->
+    <string name="wifi_p2p_disconnect_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> will end.</string>
+    <!-- Message test for disconnection from multiple devices-->
+    <string name="wifi_p2p_disconnect_multiple_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> and <xliff:g id="peer_count">%2$s</xliff:g> other devices will end.</string>
 
     <!-- Wifi AP settings-->
     <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
@@ -1401,7 +1403,7 @@
     <!-- Subtext for wifi tether checkbox on failure -->
     <string name="wifi_tether_failed_subtext">Portable Wi-Fi hotspot error</string>
     <!-- Used to open the ssid and security dialog for Wifi Access Point -->
-    <string name="wifi_tether_configure_ap_text">Configure Wi-Fi hotspot</string>
+    <string name="wifi_tether_configure_ap_text">Set up Wi-Fi hotspot</string>
     <!-- Subtext on configuration preference to indicate SSID and security chosen -->
     <string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> portable Wi-Fi hotspot</string>
     <!-- Default access point SSID used for tethering -->
@@ -1571,9 +1573,9 @@
     <!-- Dock not found dialog title -->
     <string name="dock_not_found_title">Dock not found</string>
     <!-- Dock not found dialog text -->
-    <string name="dock_not_found_text" product="tablet">You must dock the tablet before setting up dock audio.</string>
+    <string name="dock_not_found_text" product="tablet">You need to dock the tablet before setting up dock audio.</string>
     <!-- Dock not found dialog text -->
-    <string name="dock_not_found_text" product="default">You must dock the phone before setting up dock audio.</string>
+    <string name="dock_not_found_text" product="default">You need to dock the phone before setting up dock audio.</string>
     <!-- Dock settings screen, dock events SFX setting check box label -->
     <string name="dock_sounds_enable_title">Dock insert sound</string>
     <!-- Dock settings screen, setting option summary text when check box is selected -->
@@ -1744,7 +1746,7 @@
     <!-- About phone, status item title.  The phone MSID number of the current device.-->
     <string name="status_msid_number">MSID</string>
     <!-- About phone, status item title.  The phone PRL Version of the current device.-->
-    <string name="status_prl_version">PRL Version</string>
+    <string name="status_prl_version">PRL version</string>
     <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
     <string name="status_meid_number">MEID</string>
     <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
@@ -1784,7 +1786,7 @@
     <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
     <string name="memory_size">Total space</string>
     <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
-    <string name="memory_calculating_size">Calculating…</string>
+    <string name="memory_calculating_size">Calculating\u2026</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_apps_usage">Apps</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
@@ -1994,7 +1996,7 @@
     <!-- Message to draw an unlock pattern before clearing the device -->
     <string name="master_clear_gesture_prompt">Draw your unlock pattern</string>
     <!-- Explanation of drawing unlockp attern to reset phone -->
-    <string name="master_clear_gesture_explanation">You must draw your unlock pattern to confirm a factory data reset.</string>
+    <string name="master_clear_gesture_explanation">You need to draw your unlock pattern to confirm a factory data reset.</string>
     <!-- Master clear failed message -->
     <string name="master_clear_failed">No reset was performed because the System Clear service isn\'t available.</string>
     <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
@@ -2026,9 +2028,9 @@
     <!-- Message to draw an unlock pattern before clearing the device -->
     <string name="media_format_gesture_prompt">Draw your unlock pattern</string>
     <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
-    <string name="media_format_gesture_explanation" product="nosdcard">You must draw your unlock pattern to confirm that you want to erase the USB storage.</string>
+    <string name="media_format_gesture_explanation" product="nosdcard">You need to draw your unlock pattern to confirm that you want to erase the USB storage.</string>
     <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
-    <string name="media_format_gesture_explanation" product="default">You must draw your unlock pattern to confirm that you want to erase the SD card.</string>
+    <string name="media_format_gesture_explanation" product="default">You need to draw your unlock pattern to confirm that you want to erase the SD card.</string>
 
     <!-- Main settings screen, Call settings title for item to go into the call settings -->
     <string name="call_settings_title">Call settings</string>
@@ -2204,7 +2206,7 @@
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
     <string name="lockpattern_recording_incorrect_too_short">Connect at least <xliff:g id="number">%d</xliff:g> dots. Try again:</string>
     <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
-    <string name="lockpattern_pattern_entered_header">Pattern recorded!</string>
+    <string name="lockpattern_pattern_entered_header">Pattern recorded.</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
     <string name="lockpattern_need_to_confirm">Draw pattern again to confirm:</string>
     <string name="lockpattern_pattern_confirmed_header">Your new unlock pattern:</string>
@@ -2247,7 +2249,7 @@
     <!-- ChooseLockPatternTutorial, tutorial screen title -->
     <string name="lock_title" product="default">Securing your phone</string>
     <!-- ChooseLockPatternTutorial, tutorial screen text -->
-    <string name="lock_intro_message" product="tablet">Protect your tablet from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen.  You must connect at least four dots.
+    <string name="lock_intro_message" product="tablet">Protect your tablet from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen.  You need to connect at least four dots.
         \n\nReady to start? Touch Next.
     </string>
     <!-- ChooseLockPatternTutorial, tutorial screen text -->
@@ -2393,8 +2395,7 @@
     <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
     <string name="app_not_found_dlg_title"></string>
     <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-    <string name="app_not_found_dlg_text"> The app wasn\'t
-found in the list of installed apps.</string>
+    <string name="app_not_found_dlg_text"> The app wasn\'t found in the list of installed apps.</string>
     <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
     <string name="clear_data_failed">Couldn\'t clear app data.</string>
     <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2410,7 +2411,7 @@
     <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
     <string name="security_settings_desc" product="default">This app can access the following on your phone:</string>
     <string name="computing_size">Computing\u2026</string>
-    <string name="invalid_size_value">Unable to compute package size</string>
+    <string name="invalid_size_value">Couldn\'t compute package size.</string>
     <!-- String displayed when list is empty -->
     <string name="empty_list_msg">You don\'t have any third-party apps installed.</string>
     <!-- Manage applications, version string displayed in app snippet -->
@@ -2598,8 +2599,18 @@
     <string name="user_dict_settings_summary">""</string>
     <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
     <string name="user_dict_settings_add_menu_title">Add</string>
-    <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. -->
+    <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
     <string name="user_dict_settings_add_dialog_title">Add to dictionary</string>
+    <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=15] -->
+    <string name="user_dict_settings_add_dialog_options">Options</string>
+    <!-- User dictionary settings. Text on the dialog button to show the full user dictionary interface. [CHAR LIMIT=15] -->
+    <string name="user_dict_settings_add_dialog_manage">Manage entries</string>
+    <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+    <string name="user_dict_settings_add_dialog_confirm">OK</string>
+    <!-- User dictionary settings. Label to put before the shortcut field. [CHAR LIMIT=25] -->
+    <string name="user_dict_settings_add_shortcut_option_name">Shortcut:</string>
+    <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=25] -->
+    <string name="user_dict_settings_add_locale_option_name">Language:</string>
     <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
     <string name="user_dict_settings_edit_dialog_title">Edit word</string>
     <!-- User dictionary settings. The title of the context menu item to edit the current word -->
@@ -2608,8 +2619,10 @@
     <string name="user_dict_settings_context_menu_delete_title">Delete</string>
     <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
     <string name="user_dict_settings_empty_text">You don\'t have any words in the user dictionary. Add a word by touching the Add (+) button.</string>
-    <!-- User dictionary settings. The text to show to describe the dictionary common to all languages -->
-    <string name="user_dict_settings_all_languages">All languages</string>
+    <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+    <string name="user_dict_settings_all_languages">For all languages</string>
+    <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+    <string name="user_dict_settings_more_languages">More languages…</string>
 
     <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
     <string name="testing">Testing</string>
@@ -2830,9 +2843,6 @@
          help blind and low-vision users. Do you want to install it for free from Android
          Market?</string>
 
-    <!-- Title for a warning about downloading accessibility scripts displayed as a dialog message
-         when the user selects to enable script downloading. [CHAR LIMIT=50] -->
-    <string name="accessibility_script_injection_security_warning_title">Install web scripts?</string>
     <!-- Warning message about security implications of downloading accessibility scripts,
          displayed as a dialog message when the user selects to enable script downloading. [CHAR LIMIT=NONE] -->
     <string name="accessibility_script_injection_security_warning_summary">Do you want apps to
@@ -2840,7 +2850,7 @@
 
     <!-- Warning message that the interaction model changes on enabling touch exploration. [CHAR LIMIT=NONE] -->
     <string name="accessibility_touch_exploration_warning">This feature changes the
-        way your device responds to touch. Turn on?</string>
+        way your device responds to touch. Turn it on?</string>
     <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_default_description">No description provided.</string>
 
@@ -2855,7 +2865,7 @@
     <!-- Activity title summary for App Fuel Gauge summary -->
     <string name="power_usage_summary">What has been using the battery</string>
     <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
-    <string name="power_usage_not_available">Battery usage data not available</string>
+    <string name="power_usage_not_available">Battery usage data isn\'t available.</string>
     <!-- Display the battery level and status [CHAR_LIMIT=30] -->
     <string name="power_usage_level_and_status"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="status">%2$s</xliff:g></string>
     <!-- Battery usage since unplugged -->
@@ -3068,7 +3078,7 @@
     <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
     <string name="tts_settings_changed_demo">Your settings have changed. This is an example of how they sound.</string>
     <!-- Error screen when a selected TTS engine can't run because it's missing components -->
-    <string name="tts_engine_error">The engine you selected is unable to run</string>
+    <string name="tts_engine_error">The engine you chose can\'t run.</string>
     <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
     <string name="tts_engine_error_config">Configure</string>
     <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
@@ -3110,7 +3120,7 @@
     <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
          to warn the user that this engine cannot be used before the checkbox for that engine
          in TTS settings is checked. -->
-    <string name="tts_notif_engine_install_message">Enable new engine before use</string>
+    <string name="tts_notif_engine_install_message">Enable new engine before use.</string>
     <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
          the image that launches the TTS engine settings when clicked. -->
     <string name="tts_engine_settings_button">Launch engine settings</string>
@@ -3170,7 +3180,7 @@
     <!-- Toast message [CHAR LIMIT=30] -->
     <string name="credentials_enabled">Credential storage is enabled.</string>
     <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_configure_lock_screen_hint">You must set a lock screen PIN or password before you can use credential storage.</string>
+    <string name="credentials_configure_lock_screen_hint">You need to set a lock screen PIN or password before you can use credential storage.</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency tone</string>
@@ -3202,9 +3212,9 @@
     <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
     <string name="local_backup_password_title">Desktop backup password</string>
     <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
-    <string name="local_backup_password_summary_none">Desktop full backups aren\'t currently protected.</string>
+    <string name="local_backup_password_summary_none">Desktop full backups aren\'t currently protected</string>
     <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
-    <string name="local_backup_password_summary_change">Select to change or remove the password for desktop full backups</string>
+    <string name="local_backup_password_summary_change">Touch to change or remove the password for desktop full backups</string>
 
     <!-- Dialog title for confirmation to erase backup data from server -->
     <string name="backup_erase_dialog_title"></string>
@@ -3398,7 +3408,7 @@
     <string name="sync_contacts">Contacts</string>
     <!-- Message introducing the user to Google Sync. -->
     <string name="sync_plug"><font fgcolor="#ffffffff">Welcome to Google sync!</font>
-    \nA Google approach to synchronizing data to allow access to your contacts, appointments, and more from wherever you are.
+    \nA Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.
     </string>
 
     <!-- Header title for those settings relating to application syncing. -->
@@ -3573,9 +3583,9 @@
     <string name="data_usage_tab_3g">2G-3G</string>
 
     <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=10] -->
-    <string name="data_usage_list_mobile">mobile</string>
+    <string name="data_usage_list_mobile">Mobile</string>
     <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=10] -->
-    <string name="data_usage_list_none">none</string>
+    <string name="data_usage_list_none">None</string>
 
     <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
     <string name="data_usage_enable_mobile">Mobile data</string>
@@ -3732,7 +3742,7 @@
     <!-- Title for touch exploration tutorial lesson 1. -->
     <string name="accessibility_tutorial_lesson_1_title">Lesson 1: Exploring the screen</string>
     <!-- Instruction for touch exploration tutorial lesson 1. "Explore by touch" should match the string for "Title for accessibility preference to enable touch exploration mode." -->
-    <string name="accessibility_tutorial_lesson_1_text_1">After you turn on Explore by Touch, you can touch the screen to learn what\’s under your finger. For example, the current screen contains app icons. Find one of them by touching the screen and sliding your finger around.</string>
+    <string name="accessibility_tutorial_lesson_1_text_1">When Explore by Touch is turned on, you can touch the screen to learn what\’s under your finger. For example, the current screen contains app icons. Find one of them by touching the screen and sliding your finger around.</string>
     <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user touches one icon. -->
     <string name="accessibility_tutorial_lesson_1_text_2_more">Good. Keep sliding your finger around the screen until you find at least one more icon.</string>
     <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user touches a second icon. -->
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 90bdfd9..88f6491 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -71,10 +71,11 @@
                 android:persistent="false"
                 android:order="6"/>
 
+        <!-- We want a dialog with no title, so use an empty string to avoid a fall back to the preference title. -->
         <com.android.settings.AccessibilityEnableScriptInjectionPreference
                 android:key="toggle_script_injection_preference"
                 android:title="@string/accessibility_script_injection_title"
-                android:dialogTitle="@string/accessibility_script_injection_security_warning_title"
+                android:dialogTitle=""
                 android:dialogIcon="@android:drawable/ic_dialog_alert"
                 android:dialogMessage="@string/accessibility_script_injection_security_warning_summary"
                 android:positiveButtonText="@string/accessibility_script_injection_button_allow"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index d6ffc6c..b5f072f 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -40,6 +40,11 @@
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
 
+        <PreferenceScreen
+                android:key="screensaver"
+                android:title="@string/screensaver_settings_title"
+                android:fragment="com.android.settings.DreamSettings" />
+
         <ListPreference
                 android:key="font_size"
                 android:title="@string/title_font_size"
diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml
new file mode 100644
index 0000000..6569bc7
--- /dev/null
+++ b/res/xml/dream_settings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/screensaver_settings_title"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+    <com.android.settings.DreamComponentPreference
+            android:key="screensaver_component"
+            android:title="@string/screensaver_component_title"
+            android:persistent="false"
+            />
+
+    <com.android.settings.DreamTesterPreference
+            android:key="test"
+            android:title="@string/screensaver_test"
+            android:persistent="false"
+            />
+
+    <CheckBoxPreference
+            android:key="activate_on_dock"
+            android:persistent="false"
+            android:title="@string/screensaver_activate_on_dock_title"
+            android:defaultValue="true" />
+
+</PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 20ffd8e..336682d 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -54,17 +54,10 @@
         android:key="android_beam_settings"
         android:title="@string/android_beam_settings_title" />
 
-    <CheckBoxPreference
-        android:key="toggle_wifi_p2p"
-        android:title="@string/wifi_p2p_settings_title"
-        android:persistent="false" />
-
     <PreferenceScreen
         android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"
         android:key="wifi_p2p_settings"
-        android:title="@string/wifi_p2p_settings_title"
-        android:summary="@string/wifi_p2p_settings_summary">
-    </PreferenceScreen>
+        android:title="@string/wifi_p2p_settings_title" />
 
     <PreferenceScreen
         android:key="mobile_network_settings"
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index df421a2..88f7ae6 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -33,6 +33,8 @@
 
 import com.android.internal.widget.LockPatternUtils;
 
+import libcore.util.MutableBoolean;
+
 public class ChooseLockGeneric extends PreferenceActivity {
 
     @Override
@@ -167,23 +169,37 @@
             if (quality == -1) {
                 // If caller didn't specify password quality, show UI and allow the user to choose.
                 quality = intent.getIntExtra(MINIMUM_QUALITY_KEY, -1);
-                quality = upgradeQuality(quality);
+                MutableBoolean allowBiometric = new MutableBoolean(false);
+                quality = upgradeQuality(quality, allowBiometric);
                 final PreferenceScreen prefScreen = getPreferenceScreen();
                 if (prefScreen != null) {
                     prefScreen.removeAll();
                 }
                 addPreferencesFromResource(R.xml.security_settings_picker);
-                disableUnusablePreferences(quality);
+                disableUnusablePreferences(quality, allowBiometric);
             } else {
                 updateUnlockMethodAndFinish(quality, false);
             }
         }
 
-        private int upgradeQuality(int quality) {
+        /** increases the quality if necessary, and returns whether biometric is allowed */
+        private int upgradeQuality(int quality, MutableBoolean allowBiometric) {
             quality = upgradeQualityForDPM(quality);
-            quality = upgradeQualityForEncryption(quality);
             quality = upgradeQualityForKeyStore(quality);
-            return quality;
+            int encryptionQuality = upgradeQualityForEncryption(quality);
+            if (encryptionQuality > quality) {
+                //The first case checks whether biometric is allowed, prior to the user making
+                //their selection from the list
+                if (allowBiometric != null) {
+                    allowBiometric.value = quality <=
+                            DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK;
+                } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
+                    //When the user has selected biometric we shouldn't change that due to
+                    //encryption
+                    return quality;
+                }
+            }
+            return encryptionQuality;
         }
 
         private int upgradeQualityForDPM(int quality) {
@@ -228,7 +244,7 @@
          *
          * @param quality the requested quality.
          */
-        private void disableUnusablePreferences(final int quality) {
+        private void disableUnusablePreferences(final int quality, MutableBoolean allowBiometric) {
             final PreferenceScreen entries = getPreferenceScreen();
             final boolean onlyShowFallback = getActivity().getIntent()
                     .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
@@ -245,7 +261,8 @@
                     } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
                     } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK;
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK ||
+                                allowBiometric.value;
                         visible = weakBiometricAvailable; // If not available, then don't show it.
                     } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
@@ -311,7 +328,7 @@
             final boolean isFallback = getActivity().getIntent()
                 .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
 
-            quality = upgradeQuality(quality);
+            quality = upgradeQuality(quality, null);
 
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null);
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index 41a4be5..ce3ad9d 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -159,7 +159,14 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         // 1.  Confirm that we have a sufficient PIN/Password to continue
-        int quality = new LockPatternUtils(getActivity()).getActivePasswordQuality();
+        LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+        int quality = lockPatternUtils.getActivePasswordQuality();
+        if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK
+            && lockPatternUtils.isLockPasswordEnabled()) {
+            // Use the alternate as the quality. We expect this to be
+            // PASSWORD_QUALITY_SOMETHING(pattern) or PASSWORD_QUALITY_NUMERIC(PIN).
+            quality = lockPatternUtils.getKeyguardStoredPasswordQuality();
+        }
         if (quality < MIN_PASSWORD_QUALITY) {
             return false;
         }
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 5887140..d2c227b 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -39,6 +39,8 @@
 import android.view.IWindowManager;
 import android.view.Surface;
 
+import com.android.settings.DreamSettings;
+
 import java.util.ArrayList;
 
 public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -52,6 +54,7 @@
     private static final String KEY_ACCELEROMETER = "accelerometer";
     private static final String KEY_FONT_SIZE = "font_size";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
+    private static final String KEY_SCREEN_SAVER = "screensaver";
 
     private CheckBoxPreference mAccelerometer;
     private ListPreference mFontSizePref;
@@ -60,6 +63,7 @@
     private final Configuration mCurConfig = new Configuration();
     
     private ListPreference mScreenTimeoutPreference;
+    private Preference mScreenSaverPreference;
 
     private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) {
         @Override
@@ -78,6 +82,8 @@
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
         mAccelerometer.setPersistent(false);
 
+        mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
+
         mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
         final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,
                 FALLBACK_SCREEN_TIMEOUT_VALUE);
@@ -213,6 +219,14 @@
     private void updateState() {
         updateAccelerometerRotationCheckbox();
         readFontSizePreference(mFontSizePref);
+        updateScreenSaverSummary();
+    }
+
+    private void updateScreenSaverSummary() {
+        mScreenSaverPreference.setSummary(
+            DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())
+                ? R.string.screensaver_settings_summary_on
+                : R.string.screensaver_settings_summary_off);
     }
 
     private void updateAccelerometerRotationCheckbox() {
diff --git a/src/com/android/settings/DreamComponentPreference.java b/src/com/android/settings/DreamComponentPreference.java
new file mode 100644
index 0000000..b41ab3a
--- /dev/null
+++ b/src/com/android/settings/DreamComponentPreference.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import static android.provider.Settings.Secure.SCREENSAVER_COMPONENT;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class DreamComponentPreference extends Preference {
+    private static final String TAG = "DreamComponentPreference";
+
+    private static final boolean SHOW_DOCK_APPS_TOO = true;
+    
+    private final PackageManager pm;
+    private final ContentResolver resolver;
+
+    public DreamComponentPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        pm = getContext().getPackageManager();
+        resolver = getContext().getContentResolver();
+
+        refreshFromSettings();
+    }
+
+    private void refreshFromSettings() {
+        String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT);
+        if (component == null) {
+            component = getContext().getResources().getString(
+                com.android.internal.R.string.config_defaultDreamComponent);
+        }
+        if (component != null) {
+            ComponentName cn = ComponentName.unflattenFromString(component);
+            try {
+                setSummary(pm.getActivityInfo(cn, 0).loadLabel(pm));
+            } catch (PackageManager.NameNotFoundException ex) {
+                setSummary("(unknown)");
+            }
+        }
+    }
+
+    final static Comparator<ResolveInfo> sResolveInfoComparator = new Comparator<ResolveInfo>() {
+        @Override
+        public int compare(ResolveInfo a, ResolveInfo b) {
+            int cmp = a.activityInfo.applicationInfo.packageName.compareTo(
+                    b.activityInfo.applicationInfo.packageName);
+            if (cmp == 0) {
+                cmp = a.activityInfo.name.compareTo(b.activityInfo.name);
+            }
+            return cmp;
+        }
+    };
+
+    public class DreamListAdapter extends BaseAdapter implements ListAdapter {
+        private ArrayList<ResolveInfo> results;
+        private final LayoutInflater inflater;
+
+        public DreamListAdapter(Context context) {
+            Intent choosy = new Intent(Intent.ACTION_MAIN)
+                        .addCategory("android.intent.category.DREAM");
+
+            inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            results = new ArrayList<ResolveInfo>(pm.queryIntentActivities(choosy, 0));
+
+            // Group by package
+            Collections.sort(results, sResolveInfoComparator);
+
+            if (SHOW_DOCK_APPS_TOO) {
+                choosy = new Intent(Intent.ACTION_MAIN)
+                            .addCategory(Intent.CATEGORY_DESK_DOCK);
+
+                List<ResolveInfo> dockApps = pm.queryIntentActivities(choosy, 0);
+                for (ResolveInfo app : dockApps) {
+                    // do not insert duplicate packages
+                    int pos = Collections.binarySearch(results, app, sResolveInfoComparator);
+                    if (pos < 0) {
+                        results.add(-1-pos, app);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return results.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return results.get(position);
+        }
+
+        @Override
+        public long getItemId (int position) {
+            return (long) position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View row = (convertView != null) 
+                ? convertView
+                : inflater.inflate(R.layout.dream_picker_row, parent, false);
+            ResolveInfo ri = results.get(position);
+            ((TextView)row.findViewById(R.id.title)).setText(ri.loadLabel(pm));
+            ((ImageView)row.findViewById(R.id.icon)).setImageDrawable(ri.loadIcon(pm));
+            return row;
+        }
+    }
+
+    @Override
+    protected void onClick() {
+        final DreamListAdapter list = new DreamListAdapter(getContext());
+        AlertDialog alert = new AlertDialog.Builder(getContext())
+            .setAdapter(
+                list,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        ResolveInfo ri = (ResolveInfo)list.getItem(which);
+                        ActivityInfo act = ri.activityInfo;
+                        ComponentName cn = new ComponentName(
+                            act.applicationInfo.packageName,
+                            act.name);
+                        Intent intent = new Intent(Intent.ACTION_MAIN).setComponent(cn);
+                        
+                        setSummary(ri.loadLabel(pm));
+                        //getContext().startActivity(intent);
+                        
+                        Settings.Secure.putString(resolver, SCREENSAVER_COMPONENT, cn.flattenToString());
+                    }
+                })
+            .create();
+        alert.show();
+    }
+}
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
new file mode 100644
index 0000000..d9953aa
--- /dev/null
+++ b/src/com/android/settings/DreamSettings.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import static android.provider.Settings.Secure.SCREENSAVER_ENABLED;
+import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.ActivityManagerNative;
+import android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.database.ContentObserver;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.IWindowManager;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+
+import java.util.ArrayList;
+
+public class DreamSettings extends SettingsPreferenceFragment {
+    private static final String TAG = "DreamSettings";
+
+    private static final String KEY_ACTIVATE_ON_DOCK = "activate_on_dock";
+
+    private CheckBoxPreference mActivateOnDockPreference;
+
+    private Switch mEnableSwitch;
+    private Enabler mEnabler;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.dream_settings);
+
+        mActivateOnDockPreference = (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK);
+
+        final Activity activity = getActivity();
+
+        mEnableSwitch = new Switch(activity);
+
+        if (activity instanceof PreferenceActivity) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+            // note: we do not check onIsHidingHeaders() or onIsMultiPane() because there's no
+            // switch in the left-hand pane to control this; we need to show the ON/OFF in our
+            // fragment every time
+            final int padding = activity.getResources().getDimensionPixelSize(
+                    R.dimen.action_bar_switch_padding);
+            mEnableSwitch.setPadding(0, 0, padding, 0);
+            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                    ActionBar.DISPLAY_SHOW_CUSTOM);
+            activity.getActionBar().setCustomView(mEnableSwitch, new ActionBar.LayoutParams(
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+            activity.getActionBar().setTitle(R.string.screensaver_settings_title);
+        }
+
+        mEnabler = new Enabler(activity, mEnableSwitch);
+    }
+
+    public static boolean isScreenSaverEnabled(Context context) {
+        return 0 != Settings.Secure.getInt(
+                    context.getContentResolver(), SCREENSAVER_ENABLED, 1);
+    }
+
+    public static void setScreenSaverEnabled(Context context, boolean enabled) {
+        Settings.Secure.putInt(
+                context.getContentResolver(), SCREENSAVER_ENABLED, enabled ? 1 : 0);
+    }
+
+    public static class Enabler implements CompoundButton.OnCheckedChangeListener  {
+        private final Context mContext;
+        private Switch mSwitch;
+
+        public Enabler(Context context, Switch switch_) {
+            mContext = context;
+            setSwitch(switch_);
+        }
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            setScreenSaverEnabled(mContext, isChecked);
+        }
+        public void setSwitch(Switch switch_) {
+            if (mSwitch == switch_) return;
+            if (mSwitch != null) mSwitch.setOnCheckedChangeListener(null);
+            mSwitch = switch_;
+            mSwitch.setOnCheckedChangeListener(this);
+
+            final boolean enabled = isScreenSaverEnabled(mContext);
+            mSwitch.setChecked(enabled);
+        }
+        public void pause() {
+            mSwitch.setOnCheckedChangeListener(null);
+        }
+        public void resume() {
+            mSwitch.setOnCheckedChangeListener(this);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        if (mEnabler != null) {
+            mEnabler.resume();
+        }
+
+        final boolean currentActivateOnDock = 0 != Settings.Secure.getInt(getContentResolver(),
+                SCREENSAVER_ACTIVATE_ON_DOCK, 1);
+        mActivateOnDockPreference.setChecked(currentActivateOnDock);
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        if (mEnabler != null) {
+            mEnabler.pause();
+        }
+
+        super.onPause();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (preference == mActivateOnDockPreference) {
+            Settings.Secure.putInt(getContentResolver(),
+                    SCREENSAVER_ACTIVATE_ON_DOCK, 
+                    mActivateOnDockPreference.isChecked() ? 1 : 0);
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+}
diff --git a/src/com/android/settings/DreamTesterPreference.java b/src/com/android/settings/DreamTesterPreference.java
new file mode 100644
index 0000000..ccd6fc0
--- /dev/null
+++ b/src/com/android/settings/DreamTesterPreference.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import static android.provider.Settings.Secure.SCREENSAVER_COMPONENT;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DreamTesterPreference extends Preference {
+    private static final String TAG = "DreamTesterPreference";
+    
+    private final PackageManager pm;
+    private final ContentResolver resolver;
+
+    public DreamTesterPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        pm = getContext().getPackageManager();
+        resolver = getContext().getContentResolver();
+    }
+
+    @Override
+    protected void onClick() {
+        String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT);
+        Log.v(TAG, "component=" + component);
+        if (component != null) {
+            ComponentName cn = ComponentName.unflattenFromString(component);
+            Log.v(TAG, "cn=" + cn);
+            Intent intent = new Intent(Intent.ACTION_MAIN)
+                .setComponent(cn)
+                .addFlags(
+                    Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+                    )
+                .putExtra("android.dreams.TEST", true);
+            getContext().startActivity(intent);
+        }
+    }
+}
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index e27c96e..d6f6ab6 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -37,6 +37,7 @@
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -476,6 +477,9 @@
     }
 
     boolean isProvisioningNeeded() {
+        if (SystemProperties.getBoolean("net.tethering.noprovisioning", false)) {
+            return false;
+        }
         return mProvisionApp.length == 2;
     }
 
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 496947b..f4206eb 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -20,6 +20,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ListFragment;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -44,16 +45,13 @@
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
+import com.android.settings.inputmethod.UserDictionaryAddWordActivity;
 
 import java.util.Locale;
 
-public class UserDictionarySettings extends ListFragment implements DialogCreatable {
+public class UserDictionarySettings extends ListFragment {
     private static final String TAG = "UserDictionarySettings";
 
-    private static final String INSTANCE_KEY_DIALOG_EDITING_WORD = "DIALOG_EDITING_WORD";
-    private static final String INSTANCE_KEY_ADDED_WORD = "DIALOG_ADDED_WORD";
-
     private static final String[] QUERY_PROJECTION = {
         UserDictionary.Words._ID, UserDictionary.Words.WORD
     };
@@ -70,26 +68,12 @@
 
     private static final String DELETE_SELECTION = UserDictionary.Words.WORD + "=?";
 
-    private static final String EXTRA_WORD = "word";
-
     private static final int OPTIONS_MENU_ADD = Menu.FIRST;
 
-    private static final int DIALOG_ADD_OR_EDIT = 0;
-
-    private static final int FREQUENCY_FOR_USER_DICTIONARY_ADDS = 250;
-
-    /** The word being edited in the dialog (null means the user is adding a word). */
-    private String mDialogEditingWord;
-
     private Cursor mCursor;
 
     protected String mLocale;
 
-    private boolean mAddedWordAlready;
-    private boolean mAutoReturn;
-
-    private SettingsDialogFragment mDialogFragment;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -135,31 +119,6 @@
 
         setHasOptionsMenu(true);
 
-        if (savedInstanceState != null) {
-            mDialogEditingWord = savedInstanceState.getString(INSTANCE_KEY_DIALOG_EDITING_WORD);
-            mAddedWordAlready = savedInstanceState.getBoolean(INSTANCE_KEY_ADDED_WORD, false);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        final Intent intent = getActivity().getIntent();
-        if (!mAddedWordAlready
-                && intent.getAction().equals("com.android.settings.USER_DICTIONARY_INSERT")) {
-            final String word = intent.getStringExtra(EXTRA_WORD);
-            mAutoReturn = true;
-            if (word != null) {
-                showAddOrEditDialog(word);
-            }
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(INSTANCE_KEY_DIALOG_EDITING_WORD, mDialogEditingWord);
-        outState.putBoolean(INSTANCE_KEY_ADDED_WORD, mAddedWordAlready);
     }
 
     private Cursor createCursor(final String locale) {
@@ -216,9 +175,18 @@
         return true;
     }
 
-    private void showAddOrEditDialog(String editingWord) {
-        mDialogEditingWord = editingWord;
-        showDialog(DIALOG_ADD_OR_EDIT);
+    /**
+     * Add or edit a word. If editingWord is null, it's an add; otherwise, it's an edit.
+     * @param editingWord the word to edit, or null if it's an add.
+     */
+    private void showAddOrEditDialog(final String editingWord) {
+        final Intent intent = new Intent(null == editingWord
+                ? UserDictionaryAddWordActivity.MODE_INSERT_ACTION
+                : UserDictionaryAddWordActivity.MODE_EDIT_ACTION);
+        // The following are fine if they are null
+        intent.putExtra(UserDictionaryAddWordActivity.EXTRA_WORD, editingWord);
+        intent.putExtra(UserDictionaryAddWordActivity.EXTRA_LOCALE, mLocale);
+        startActivity(intent);
     }
 
     private String getWord(int position) {
@@ -231,81 +199,8 @@
                 mCursor.getColumnIndexOrThrow(UserDictionary.Words.WORD));
     }
 
-    @Override
-    public Dialog onCreateDialog(int id) {
-        final Activity activity = getActivity();
-        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
-        final LayoutInflater inflater = LayoutInflater.from(dialogBuilder.getContext());
-        final View content = inflater.inflate(R.layout.dialog_edittext, null);
-        final EditText editText = (EditText) content.findViewById(R.id.edittext);
-        editText.setText(mDialogEditingWord);
-        // No prediction in soft keyboard mode. TODO: Create a better way to disable prediction
-        editText.setInputType(InputType.TYPE_CLASS_TEXT 
-                | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
-
-        AlertDialog dialog = dialogBuilder
-                .setTitle(mDialogEditingWord != null 
-                        ? R.string.user_dict_settings_edit_dialog_title 
-                        : R.string.user_dict_settings_add_dialog_title)
-                .setView(content)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        onAddOrEditFinished(editText.getText().toString());
-                        if (mAutoReturn) activity.onBackPressed();
-                    }})
-                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (mAutoReturn) activity.onBackPressed();
-                    }})
-                .create();
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
-                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        return dialog;
-    }
-
-    private void showDialog(int dialogId) {
-        if (mDialogFragment != null) {
-            Log.e(TAG, "Old dialog fragment not null!");
-        }
-        mDialogFragment = new SettingsDialogFragment(this, dialogId);
-        mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
-    }
-
-    private void onAddOrEditFinished(String word) {
-        if (mDialogEditingWord != null) {
-            // The user was editing a word, so do a delete/add
-            deleteWord(mDialogEditingWord);
-        }
-
-        // Disallow duplicates
-        deleteWord(word);
-
-        // TODO: present UI for picking whether to add word to all locales, or current.
-        if (null == mLocale) {
-            // Null means insert with the default system locale.
-            UserDictionary.Words.addWord(getActivity(), word.toString(),
-                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_CURRENT);
-        } else if ("".equals(mLocale)) {
-            // Empty string means insert for all languages.
-            UserDictionary.Words.addWord(getActivity(), word.toString(),
-                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_ALL);
-        } else {
-            // TODO: fix the framework so that it can accept a locale when we add a word
-            // to the user dictionary instead of querying the system locale.
-            final Locale prevLocale = Locale.getDefault();
-            Locale.setDefault(Utils.createLocaleFromString(mLocale));
-            UserDictionary.Words.addWord(getActivity(), word.toString(),
-                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_CURRENT);
-            Locale.setDefault(prevLocale);
-        }
-        if (null != mCursor && !mCursor.requery()) {
-            throw new IllegalStateException("can't requery on already-closed cursor.");
-        }
-        mAddedWordAlready = true;
-    }
-
-    private void deleteWord(String word) {
-        getActivity().getContentResolver().delete(
+    public static void deleteWord(final String word, final ContentResolver resolver) {
+        resolver.delete(
                 UserDictionary.Words.CONTENT_URI, DELETE_SELECTION, new String[] { word });
     }
 
@@ -355,7 +250,8 @@
         }
 
         public void onClick(View v) {
-            mSettings.deleteWord((String) v.getTag());
+            UserDictionarySettings.deleteWord((String) v.getTag(),
+                    mSettings.getActivity().getContentResolver());
         }
     }
 }
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 13f6902..6ae3275 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -37,7 +37,6 @@
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.settings.nfc.NfcEnabler;
-import com.android.settings.wifi.p2p.WifiP2pEnabler;
 
 public class WirelessSettings extends SettingsPreferenceFragment {
 
@@ -46,7 +45,6 @@
     private static final String KEY_WIMAX_SETTINGS = "wimax_settings";
     private static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
     private static final String KEY_VPN_SETTINGS = "vpn_settings";
-    private static final String KEY_TOGGLE_WIFI_P2P = "toggle_wifi_p2p";
     private static final String KEY_WIFI_P2P_SETTINGS = "wifi_p2p_settings";
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
@@ -60,8 +58,6 @@
     private NfcEnabler mNfcEnabler;
     private NfcAdapter mNfcAdapter;
 
-    private WifiP2pEnabler mWifiP2pEnabler;
-
     /**
      * Invoked on each preference click in this hierarchy, overrides
      * PreferenceActivity's implementation.  Used to make sure we track the
@@ -102,8 +98,6 @@
         CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
         PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS);
 
-        CheckBoxPreference wifiP2p = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI_P2P);
-
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
@@ -156,11 +150,8 @@
         WifiP2pManager p2p = (WifiP2pManager) activity.getSystemService(Context.WIFI_P2P_SERVICE);
 
         if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) {
-            getPreferenceScreen().removePreference(wifiP2p);
-        } else {
-            mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p);
+            getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
         }
-        getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
 
         // Enable Proxy selector settings if allowed.
         Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);
@@ -189,10 +180,6 @@
         if (mNfcEnabler != null) {
             mNfcEnabler.resume();
         }
-
-        if (mWifiP2pEnabler != null) {
-            mWifiP2pEnabler.resume();
-        }
     }
 
     @Override
@@ -203,10 +190,6 @@
         if (mNfcEnabler != null) {
             mNfcEnabler.pause();
         }
-
-        if (mWifiP2pEnabler != null) {
-            mWifiP2pEnabler.pause();
-        }
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
index 952146d..28b8616 100644
--- a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
+++ b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
@@ -34,8 +34,7 @@
     private SettingsPreferenceFragment mFragment;
     private TextView mTitleText;
     private TextView mSummaryText;
-    private View mCheckBox;
-    private ImageView mSetingsButton;
+    private ImageView mSettingsButton;
     private Intent mSettingsIntent;
 
     public CheckBoxAndSettingsPreference(Context context, AttributeSet attrs) {
@@ -47,28 +46,28 @@
     @Override
     protected void onBindView(View view) {
         super.onBindView(view);
-        mCheckBox = view.findViewById(R.id.inputmethod_pref);
-        mCheckBox.setOnClickListener(
+        View textLayout = view.findViewById(R.id.inputmethod_pref);
+        textLayout.setOnClickListener(
                 new OnClickListener() {
                     @Override
                     public void onClick(View arg0) {
                         onCheckBoxClicked();
                     }
                 });
-        mSetingsButton = (ImageView)view.findViewById(R.id.inputmethod_settings);
+
+        mSettingsButton = (ImageView) view.findViewById(R.id.inputmethod_settings);
         mTitleText = (TextView)view.findViewById(android.R.id.title);
         mSummaryText = (TextView)view.findViewById(android.R.id.summary);
-        mSetingsButton.setOnClickListener(
+        mSettingsButton.setOnClickListener(
                 new OnClickListener() {
                     @Override
-                    public void onClick(View arg0) {
-                        onSettingsButtonClicked(arg0);
+                    public void onClick(View clickedView) {
+                        onSettingsButtonClicked();
                     }
                 });
         enableSettingsButton();
     }
 
-
     @Override
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
@@ -88,23 +87,23 @@
         }
     }
 
-    protected void onSettingsButtonClicked(View arg0) {
+    protected void onSettingsButtonClicked() {
         if (mFragment != null && mSettingsIntent != null) {
             mFragment.startActivity(mSettingsIntent);
         }
     }
 
     private void enableSettingsButton() {
-        if (mSetingsButton != null) {
+        if (mSettingsButton != null) {
             if (mSettingsIntent == null) {
-                mSetingsButton.setVisibility(View.GONE);
+                mSettingsButton.setVisibility(View.GONE);
             } else {
                 final boolean checked = isChecked();
-                mSetingsButton.setEnabled(checked);
-                mSetingsButton.setClickable(checked);
-                mSetingsButton.setFocusable(checked);
+                mSettingsButton.setEnabled(checked);
+                mSettingsButton.setClickable(checked);
+                mSettingsButton.setFocusable(checked);
                 if (!checked) {
-                    mSetingsButton.setAlpha(DISABLED_ALPHA);
+                    mSettingsButton.setAlpha(DISABLED_ALPHA);
                 }
             }
         }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
new file mode 100644
index 0000000..6ab6a50
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import com.android.settings.R;
+import com.android.settings.UserDictionarySettings;
+import com.android.settings.Utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import android.animation.LayoutTransition;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.UserDictionary;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.Spinner;
+
+public class UserDictionaryAddWordActivity extends Activity
+        implements AdapterView.OnItemSelectedListener {
+    public static final String EXTRA_WORD = "word";
+    public static final String EXTRA_LOCALE = "locale";
+    private static final int FREQUENCY_FOR_USER_DICTIONARY_ADDS = 250;
+
+    public static final String MODE_EDIT_ACTION = "com.android.settings.USER_DICTIONARY_EDIT";
+    public static final String MODE_INSERT_ACTION = "com.android.settings.USER_DICTIONARY_INSERT";
+    private static final int MODE_EDIT = 0;
+    private static final int MODE_INSERT = 1;
+
+    private EditText mEditText;
+    private int mMode; // Either MODE_EDIT or MODE_INSERT
+    private String mOldWord;
+    private String mLocale; // may not be null: will be converted to default locale if received null
+
+    @Override
+    public void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.user_dictionary_add_word);
+        final Intent intent = getIntent();
+        final String action = intent.getAction();
+        if (MODE_EDIT_ACTION.equals(action)) {
+            mMode = MODE_EDIT;
+        } else if (MODE_INSERT_ACTION.equals(action)) {
+            mMode = MODE_INSERT;
+        } else {
+            // Can never come here because we only support these two actions in the manifest
+            throw new RuntimeException("Unsupported action: " + action);
+        }
+        mOldWord = intent.getStringExtra(EXTRA_WORD);
+        final String locale = intent.getStringExtra(EXTRA_LOCALE); // this may be null
+        mLocale = null == locale ? Locale.getDefault().toString() : locale;
+        mEditText = (EditText)findViewById(R.id.user_dictionary_add_word_text);
+        if (null != mOldWord) {
+            mEditText.setText(mOldWord);
+            mEditText.setSelection(mOldWord.length());
+        }
+        final ViewGroup v = (ViewGroup)findViewById(R.id.user_dict_settings_add_dialog_top);
+        final LayoutTransition transition = new LayoutTransition();
+        transition.setStartDelay(LayoutTransition.APPEARING, 0);
+        v.setLayoutTransition(transition);
+    }
+
+    public void onClickCancel(final View v) {
+        finish();
+    }
+
+    public void onClickManage(final View v) {
+        final Intent intent = new Intent(v.getContext(), UserDictionarySettings.class);
+        startActivity(intent);
+        finish();
+    }
+
+    public void onClickConfirm(final View v) {
+        if (MODE_EDIT == mMode && !TextUtils.isEmpty(mOldWord)) {
+            UserDictionarySettings.deleteWord(mOldWord, this.getContentResolver());
+        }
+        final String newWord = mEditText.getText().toString();
+        if (TextUtils.isEmpty(newWord)) {
+            // If the word is somehow empty, don't insert it.
+            // TODO: grey out the Ok button when the text is empty?
+            finish();
+            return;
+        }
+        // Disallow duplicates.
+        // TODO: Redefine the logic when we support shortcuts.
+        UserDictionarySettings.deleteWord(newWord, this.getContentResolver());
+
+        if (TextUtils.isEmpty(mLocale)) {
+            // Empty string means insert for all languages.
+            UserDictionary.Words.addWord(this, newWord.toString(),
+                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_ALL);
+        } else {
+            // TODO: fix the framework so that it can accept a locale when we add a word
+            // to the user dictionary instead of querying the system locale.
+            final Locale prevLocale = Locale.getDefault();
+            Locale.setDefault(Utils.createLocaleFromString(mLocale));
+            UserDictionary.Words.addWord(this, newWord.toString(),
+                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_CURRENT);
+            Locale.setDefault(prevLocale);
+        }
+        finish();
+    }
+
+    private static class LocaleRenderer {
+        private final String mLocaleString;
+        private final String mDescription;
+        // LocaleString may NOT be null.
+        public LocaleRenderer(final Context context, final String localeString) {
+            mLocaleString = localeString;
+            if (null == localeString) {
+                mDescription = context.getString(R.string.user_dict_settings_more_languages);
+            } else if ("".equals(localeString)) {
+                mDescription = context.getString(R.string.user_dict_settings_all_languages);
+            } else {
+                mDescription = Utils.createLocaleFromString(localeString).getDisplayName();
+            }
+        }
+        public String toString() {
+            return mDescription;
+        }
+        public String getLocaleString() {
+            return mLocaleString;
+        }
+    }
+
+    private static void addLocaleDisplayNameToList(final Context context,
+            final List<LocaleRenderer> list, final String locale) {
+        if (null != locale) {
+            list.add(new LocaleRenderer(context, locale));
+        }
+    }
+
+    public void onClickOptions(final View v) {
+        final View moreOptionsView =
+                findViewById(R.id.user_dict_settings_add_dialog_shortcut_interface);
+        moreOptionsView.setVisibility(View.VISIBLE);
+        findViewById(R.id.user_dictionary_settings_add_dialog_options).setVisibility(View.GONE);
+        findViewById(R.id.user_dictionary_settings_add_dialog_manage).setVisibility(View.VISIBLE);
+
+        final Set<String> locales = UserDictionaryList.getUserDictionaryLocalesList(this);
+        // Remove our locale if it's in, because we're always gonna put it at the top
+        locales.remove(mLocale); // mLocale may not be null
+        final String systemLocale = Locale.getDefault().toString();
+        // The system locale should be inside. We want it at the 2nd spot.
+        locales.remove(systemLocale); // system locale may not be null
+        locales.remove(""); // Remove the empty string if it's there
+        final ArrayList<LocaleRenderer> localesList = new ArrayList<LocaleRenderer>();
+        // Add the passed locale, then the system locale at the top of the list. Add an
+        // "all languages" entry at the bottom of the list.
+        addLocaleDisplayNameToList(this, localesList, mLocale);
+        if (!systemLocale.equals(mLocale)) {
+            addLocaleDisplayNameToList(this, localesList, systemLocale);
+        }
+        for (final String l : locales) {
+            // TODO: sort in unicode order
+            addLocaleDisplayNameToList(this, localesList, l);
+        }
+        localesList.add(new LocaleRenderer(this, "")); // meaning: all languages
+        localesList.add(new LocaleRenderer(this, null)); // meaning: select another locale
+        final Spinner localeSpinner =
+                (Spinner)findViewById(R.id.user_dictionary_settings_add_dialog_locale);
+        final ArrayAdapter<LocaleRenderer> adapter = new ArrayAdapter<LocaleRenderer>(this,
+                android.R.layout.simple_spinner_item, localesList);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        localeSpinner.setAdapter(adapter);
+        localeSpinner.setOnItemSelectedListener(this);
+    }
+
+    @Override
+    public void onItemSelected(final AdapterView<?> parent, final View view, final int pos,
+            final long id) {
+        final LocaleRenderer locale = (LocaleRenderer)parent.getItemAtPosition(pos);
+        mLocale = locale.getLocaleString();
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+        // I'm not sure we can come here, but if we do, that's the right thing to do.
+        final Intent intent = getIntent();
+        final String locale = intent.getStringExtra(EXTRA_LOCALE); // this may be null
+        mLocale = null == locale ? Locale.getDefault().toString() : locale;
+    }
+}
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index aaae887..6703187 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -102,8 +102,10 @@
         mName.setText(mProfile.name);
         mType.setSelection(mProfile.type);
         mServer.setText(mProfile.server);
-        mUsername.setText(mProfile.username);
-        mPassword.setText(mProfile.password);
+        if (mProfile.saveLogin) {
+            mUsername.setText(mProfile.username);
+            mPassword.setText(mProfile.password);
+        }
         mSearchDomains.setText(mProfile.searchDomains);
         mDnsServers.setText(mProfile.dnsServers);
         mRoutes.setText(mProfile.routes);
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
deleted file mode 100644
index e688905..0000000
--- a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.p2p;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.net.wifi.WpsInfo;
-import android.net.wifi.p2p.WifiP2pConfig;
-import android.net.wifi.p2p.WifiP2pDevice;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.CheckBox;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-/**
- * Dialog to setup a p2p connection
- */
-public class WifiP2pDialog extends AlertDialog implements AdapterView.OnItemSelectedListener {
-
-    static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
-
-    private final DialogInterface.OnClickListener mListener;
-
-    private View mView;
-    private TextView mDeviceName;
-    private TextView mDeviceAddress;
-
-    /* These values come from "wifi_p2p_wps_setup" resource array */
-    private static final int WPS_PBC = 0;
-    private static final int WPS_KEYPAD = 1;
-    private static final int WPS_DISPLAY = 2;
-
-    private int mWpsSetupIndex = WPS_PBC; //default is pbc
-
-    WifiP2pDevice mDevice;
-
-    public WifiP2pDialog(Context context, DialogInterface.OnClickListener listener,
-            WifiP2pDevice device) {
-        super(context);
-        mListener = listener;
-        mDevice = device;
-    }
-
-    public WifiP2pConfig getConfig() {
-        WifiP2pConfig config = new WifiP2pConfig();
-        config.deviceAddress = mDeviceAddress.getText().toString();
-        config.wps = new WpsInfo();
-        switch (mWpsSetupIndex) {
-            case WPS_PBC:
-                config.wps.setup = WpsInfo.PBC;
-                break;
-            case WPS_KEYPAD:
-                config.wps.setup = WpsInfo.KEYPAD;
-                config.wps.pin = ((TextView) mView.findViewById(R.id.wps_pin)).
-                        getText().toString();
-                break;
-            case WPS_DISPLAY:
-                config.wps.setup = WpsInfo.DISPLAY;
-                break;
-            default:
-                config.wps.setup = WpsInfo.PBC;
-                break;
-        }
-        return config;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-
-        mView = getLayoutInflater().inflate(R.layout.wifi_p2p_dialog, null);
-        Spinner mWpsSetup = ((Spinner) mView.findViewById(R.id.wps_setup));
-
-        setView(mView);
-        setInverseBackgroundForced(true);
-
-        Context context = getContext();
-
-        setTitle(R.string.wifi_p2p_settings_title);
-        mDeviceName = (TextView) mView.findViewById(R.id.device_name);
-        mDeviceAddress = (TextView) mView.findViewById(R.id.device_address);
-
-        setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_connect), mListener);
-        setButton(DialogInterface.BUTTON_NEGATIVE,
-                    context.getString(R.string.wifi_cancel), mListener);
-
-        if (mDevice != null) {
-            mDeviceName.setText(mDevice.deviceName);
-            mDeviceAddress.setText(mDevice.deviceAddress);
-            mWpsSetup.setSelection(mWpsSetupIndex); //keep pbc as default
-       }
-
-        mWpsSetup.setOnItemSelectedListener(this);
-
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        mWpsSetupIndex = position;
-
-        if (mWpsSetupIndex == WPS_KEYPAD) {
-            mView.findViewById(R.id.wps_pin_entry).setVisibility(View.VISIBLE);
-        } else {
-            mView.findViewById(R.id.wps_pin_entry).setVisibility(View.GONE);
-        }
-        return;
-    }
-
-    @Override
-    public void onNothingSelected(AdapterView<?> parent) {
-    }
-
-}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java b/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
index 0747d64..cde44cd 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
@@ -27,18 +27,21 @@
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.provider.Settings;
+import android.widget.CompoundButton;
+import android.widget.Switch;
 import android.util.Log;
 
 /**
  * WifiP2pEnabler is a helper to manage the Wifi p2p on/off
  */
-public class WifiP2pEnabler implements Preference.OnPreferenceChangeListener {
+public class WifiP2pEnabler implements CompoundButton.OnCheckedChangeListener {
     private static final String TAG = "WifiP2pEnabler";
 
     private final Context mContext;
-    private final CheckBoxPreference mCheckBox;
     private final IntentFilter mIntentFilter;
+    private Switch mSwitch;
     private WifiP2pManager mWifiP2pManager;
+    private boolean mStateMachineEvent;
     private WifiP2pManager.Channel mChannel;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -53,9 +56,9 @@
         }
     };
 
-    public WifiP2pEnabler(Context context, CheckBoxPreference checkBox) {
+    public WifiP2pEnabler(Context context, Switch switch_) {
         mContext = context;
-        mCheckBox = checkBox;
+        mSwitch = switch_;
 
         mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE);
         if (mWifiP2pManager != null) {
@@ -64,7 +67,7 @@
                 //Failure to set up connection
                 Log.e(TAG, "Failed to set up connection with wifi p2p service");
                 mWifiP2pManager = null;
-                mCheckBox.setEnabled(false);
+                mSwitch.setEnabled(false);
             }
         } else {
             Log.e(TAG, "mWifiP2pManager is null!");
@@ -76,42 +79,54 @@
     public void resume() {
         if (mWifiP2pManager == null) return;
         mContext.registerReceiver(mReceiver, mIntentFilter);
-        mCheckBox.setOnPreferenceChangeListener(this);
+        mSwitch.setOnCheckedChangeListener(this);
     }
 
     public void pause() {
         if (mWifiP2pManager == null) return;
         mContext.unregisterReceiver(mReceiver);
-        mCheckBox.setOnPreferenceChangeListener(null);
+        mSwitch.setOnCheckedChangeListener(null);
     }
 
-    public boolean onPreferenceChange(Preference preference, Object value) {
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
-        if (mWifiP2pManager == null) return false;
+        if (mStateMachineEvent) return;
 
-        mCheckBox.setEnabled(false);
-        final boolean enable = (Boolean) value;
-        if (enable) {
+        if (mWifiP2pManager == null) return;
+
+        mSwitch.setEnabled(false);
+        if (isChecked) {
             mWifiP2pManager.enableP2p(mChannel);
         } else {
             mWifiP2pManager.disableP2p(mChannel);
         }
-        return false;
     }
 
     private void handleP2pStateChanged(int state) {
-        mCheckBox.setEnabled(true);
+        setSwitchChecked(true);
         switch (state) {
             case WifiP2pManager.WIFI_P2P_STATE_ENABLED:
-                mCheckBox.setChecked(true);
+                setSwitchChecked(true);
+                mSwitch.setEnabled(true);
                 break;
             case WifiP2pManager.WIFI_P2P_STATE_DISABLED:
-                mCheckBox.setChecked(false);
+                setSwitchChecked(false);
+                mSwitch.setEnabled(true);
                 break;
             default:
+                mSwitch.setEnabled(false);
+                setSwitchChecked(false);
                 Log.e(TAG,"Unhandled wifi state " + state);
                 break;
         }
     }
 
+    private void setSwitchChecked(boolean checked) {
+        if (checked != mSwitch.isChecked()) {
+            mStateMachineEvent = true;
+            mSwitch.setChecked(checked);
+            mStateMachineEvent = false;
+        }
+    }
+
 }
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index f6588b9..f09e4eb 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -32,8 +32,9 @@
 import android.net.wifi.p2p.WifiP2pDeviceList;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pManager.PeerListListener;
+import android.net.wifi.WpsInfo;
 import android.os.Bundle;
-import android.os.Message;
+import android.os.Handler;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
@@ -45,6 +46,8 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Switch;
+import android.widget.Toast;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -60,25 +63,27 @@
         implements PeerListListener {
 
     private static final String TAG = "WifiP2pSettings";
+    private static final boolean DBG = false;
     private static final int MENU_ID_SEARCH = Menu.FIRST;
-    private static final int MENU_ID_CREATE_GROUP = Menu.FIRST + 1;
-    private static final int MENU_ID_REMOVE_GROUP = Menu.FIRST + 2;
-    private static final int MENU_ID_ADVANCED = Menu.FIRST +3;
-
+    private static final int MENU_ID_RENAME = Menu.FIRST + 1;
 
     private final IntentFilter mIntentFilter = new IntentFilter();
     private WifiP2pManager mWifiP2pManager;
     private WifiP2pManager.Channel mChannel;
-    private WifiP2pDialog mConnectDialog;
-    private OnClickListener mConnectListener;
     private OnClickListener mDisconnectListener;
     private WifiP2pPeer mSelectedWifiPeer;
 
+    private WifiP2pEnabler mWifiP2pEnabler;
+    private boolean mWifiP2pEnabled;
+    private boolean mWifiP2pSearching;
+    private int mConnectedDevices;
+
+    private Handler mUiHandler;
+
     private PreferenceGroup mPeersGroup;
     private Preference mThisDevicePref;
 
-    private static final int DIALOG_CONNECT     = 1;
-    private static final int DIALOG_DISCONNECT  = 2;
+    private static final int DIALOG_DISCONNECT  = 1;
 
     private WifiP2pDevice mThisDevice;
     private WifiP2pDeviceList mPeers = new WifiP2pDeviceList();
@@ -89,7 +94,9 @@
             String action = intent.getAction();
 
             if (WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION.equals(action)) {
-                //TODO: nothing right now
+                mWifiP2pEnabled = intent.getIntExtra(WifiP2pManager.EXTRA_WIFI_STATE,
+                    WifiP2pManager.WIFI_P2P_STATE_DISABLED) == WifiP2pManager.WIFI_P2P_STATE_ENABLED;
+                handleP2pStateChanged();
             } else if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) {
                 if (mWifiP2pManager != null) {
                     mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
@@ -99,12 +106,12 @@
                 NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(
                         WifiP2pManager.EXTRA_NETWORK_INFO);
                 if (networkInfo.isConnected()) {
-                    Log.d(TAG, "Connected");
+                    if (DBG) Log.d(TAG, "Connected");
                 }
             } else if (WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action)) {
                 mThisDevice = (WifiP2pDevice) intent.getParcelableExtra(
                         WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);
-                Log.d(TAG, "Update device info: " + mThisDevice);
+                if (DBG) Log.d(TAG, "Update device info: " + mThisDevice);
                 updateDevicePref();
             }
         }
@@ -120,6 +127,8 @@
         mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
         mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
 
+        mUiHandler = new Handler();
+
         final Activity activity = getActivity();
         mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
         if (mWifiP2pManager != null) {
@@ -133,27 +142,6 @@
             Log.e(TAG, "mWifiP2pManager is null !");
         }
 
-        //connect dialog listener
-        mConnectListener = new OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                if (which == DialogInterface.BUTTON_POSITIVE) {
-                    WifiP2pConfig config = mConnectDialog.getConfig();
-                    if (mWifiP2pManager != null) {
-                        mWifiP2pManager.connect(mChannel, config,
-                                new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " connect success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " connect fail " + reason);
-                            }
-                        });
-                    }
-                }
-            }
-        };
-
         //disconnect dialog listener
         mDisconnectListener = new OnClickListener() {
             @Override
@@ -162,96 +150,101 @@
                     if (mWifiP2pManager != null) {
                         mWifiP2pManager.removeGroup(mChannel, new WifiP2pManager.ActionListener() {
                             public void onSuccess() {
-                                Log.d(TAG, " remove group success");
+                                if (DBG) Log.d(TAG, " remove group success");
                             }
                             public void onFailure(int reason) {
-                                Log.d(TAG, " remove group fail " + reason);
+                                if (DBG) Log.d(TAG, " remove group fail " + reason);
                             }
                         });
                     }
                 }
             }
         };
+
+        Switch actionBarSwitch = new Switch(activity);
+
+        if (activity instanceof PreferenceActivity) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
+                final int padding = activity.getResources().getDimensionPixelSize(
+                        R.dimen.action_bar_switch_padding);
+                actionBarSwitch.setPadding(0, 0, padding, 0);
+                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                        ActionBar.DISPLAY_SHOW_CUSTOM);
+                activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
+                            ActionBar.LayoutParams.WRAP_CONTENT,
+                            ActionBar.LayoutParams.WRAP_CONTENT,
+                            Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+            }
+        }
+
+        mWifiP2pEnabler = new WifiP2pEnabler(activity, actionBarSwitch);
+
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.removeAll();
+
+        preferenceScreen.setOrderingAsAdded(true);
+        mThisDevicePref = new Preference(getActivity());
+        preferenceScreen.addPreference(mThisDevicePref);
+
         setHasOptionsMenu(true);
     }
 
     @Override
     public void onResume() {
         super.onResume();
+        mWifiP2pEnabler.resume();
         getActivity().registerReceiver(mReceiver, mIntentFilter);
-
-        if (mWifiP2pManager != null) {
-            mWifiP2pManager.discoverPeers(mChannel, new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " discover success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " discover fail " + reason);
-                            }
-                        });
-        }
+        startSearch();
     }
 
     @Override
     public void onPause() {
         super.onPause();
+        mWifiP2pEnabler.pause();
         getActivity().unregisterReceiver(mReceiver);
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        menu.add(Menu.NONE, MENU_ID_SEARCH, 0, R.string.wifi_p2p_menu_search)
+        int textId = mWifiP2pSearching ? R.string.wifi_p2p_menu_searching :
+                R.string.wifi_p2p_menu_search;
+        menu.add(Menu.NONE, MENU_ID_SEARCH, 0, textId)
+            .setEnabled(mWifiP2pEnabled)
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        menu.add(Menu.NONE, MENU_ID_CREATE_GROUP, 0, R.string.wifi_p2p_menu_create_group)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        menu.add(Menu.NONE, MENU_ID_REMOVE_GROUP, 0, R.string.wifi_p2p_menu_remove_group)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_p2p_menu_advanced)
+        menu.add(Menu.NONE, MENU_ID_RENAME, 0, R.string.wifi_p2p_menu_rename)
+            .setEnabled(mWifiP2pEnabled)
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        MenuItem searchMenu = menu.findItem(MENU_ID_SEARCH);
+        MenuItem renameMenu = menu.findItem(MENU_ID_RENAME);
+        if (mWifiP2pEnabled) {
+            searchMenu.setEnabled(true);
+            renameMenu.setEnabled(true);
+        } else {
+            searchMenu.setEnabled(false);
+            renameMenu.setEnabled(false);
+        }
+
+        if (mWifiP2pSearching) {
+            searchMenu.setTitle(R.string.wifi_p2p_menu_searching);
+        } else {
+            searchMenu.setTitle(R.string.wifi_p2p_menu_search);
+        }
+    }
+
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case MENU_ID_SEARCH:
-                if (mWifiP2pManager != null) {
-                    mWifiP2pManager.discoverPeers(mChannel, new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " discover success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " discover fail " + reason);
-                            }
-                        });
-                }
+                startSearch();
                 return true;
-            case MENU_ID_CREATE_GROUP:
-                if (mWifiP2pManager != null) {
-                    mWifiP2pManager.createGroup(mChannel, new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " create group success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " create group fail " + reason);
-                            }
-                        });
-                }
-                return true;
-            case MENU_ID_REMOVE_GROUP:
-                if (mWifiP2pManager != null) {
-                    mWifiP2pManager.removeGroup(mChannel, new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " remove group success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " remove group fail " + reason);
-                            }
-                        });
-                }
-                return true;
-            case MENU_ID_ADVANCED:
-                //TODO: add advanced settings for p2p
+            case MENU_ID_RENAME:
+                //TODO: handle rename
                 return true;
         }
         return super.onOptionsItemSelected(item);
@@ -264,7 +257,27 @@
             if (mSelectedWifiPeer.device.status == WifiP2pDevice.CONNECTED) {
                 showDialog(DIALOG_DISCONNECT);
             } else {
-                showDialog(DIALOG_CONNECT);
+                WifiP2pConfig config = new WifiP2pConfig();
+                config.deviceAddress = mSelectedWifiPeer.device.deviceAddress;
+                if (mSelectedWifiPeer.device.wpsPbcSupported()) {
+                    config.wps.setup = WpsInfo.PBC;
+                } else if (mSelectedWifiPeer.device.wpsKeypadSupported()) {
+                    config.wps.setup = WpsInfo.KEYPAD;
+                } else {
+                    config.wps.setup = WpsInfo.DISPLAY;
+                }
+                mWifiP2pManager.connect(mChannel, config,
+                        new WifiP2pManager.ActionListener() {
+                            public void onSuccess() {
+                                if (DBG) Log.d(TAG, " connect success");
+                            }
+                            public void onFailure(int reason) {
+                                Log.e(TAG, " connect fail " + reason);
+                                Toast.makeText(getActivity(),
+                                        R.string.wifi_p2p_failed_connect_message,
+                                        Toast.LENGTH_SHORT).show();
+                            }
+                    });
             }
         }
         return super.onPreferenceTreeClick(screen, preference);
@@ -272,14 +285,15 @@
 
     @Override
     public Dialog onCreateDialog(int id) {
-        if (id == DIALOG_CONNECT) {
-            mConnectDialog = new WifiP2pDialog(getActivity(), mConnectListener,
-                mSelectedWifiPeer.device);
-            return mConnectDialog;
-        } else if (id == DIALOG_DISCONNECT) {
+        if (id == DIALOG_DISCONNECT) {
+            int stringId = (mConnectedDevices > 1) ? R.string.wifi_p2p_disconnect_multiple_message :
+                    R.string.wifi_p2p_disconnect_message;
+            String deviceName = TextUtils.isEmpty(mSelectedWifiPeer.device.deviceName) ?
+                    mSelectedWifiPeer.device.deviceAddress :
+                    mSelectedWifiPeer.device.deviceName;
             AlertDialog dialog = new AlertDialog.Builder(getActivity())
-                .setTitle("Disconnect ?")
-                .setMessage("Do you want to disconnect ?")
+                .setTitle(R.string.wifi_p2p_disconnect_title)
+                .setMessage(getActivity().getString(stringId, deviceName))
                 .setPositiveButton(getActivity().getString(R.string.dlg_ok), mDisconnectListener)
                 .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
                 .create();
@@ -289,33 +303,61 @@
     }
 
     public void onPeersAvailable(WifiP2pDeviceList peers) {
-
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.removeAll();
-
-        preferenceScreen.setOrderingAsAdded(true);
-
-        if (mPeersGroup == null) {
-            mPeersGroup = new PreferenceCategory(getActivity());
-        } else {
-            mPeersGroup.removeAll();
-        }
-
-        preferenceScreen.addPreference(mThisDevicePref);
-
-        mPeersGroup.setTitle(R.string.wifi_p2p_available_devices);
-        mPeersGroup.setEnabled(true);
-        preferenceScreen.addPreference(mPeersGroup);
+        mPeersGroup.removeAll();
 
         mPeers = peers;
+        mConnectedDevices = 0;
         for (WifiP2pDevice peer: peers.getDeviceList()) {
             mPeersGroup.addPreference(new WifiP2pPeer(getActivity(), peer));
+            if (peer.status == WifiP2pDevice.CONNECTED) mConnectedDevices++;
+        }
+    }
+
+    private void handleP2pStateChanged() {
+        updateSearchMenu(false);
+        if (mWifiP2pEnabled) {
+            final PreferenceScreen preferenceScreen = getPreferenceScreen();
+            preferenceScreen.removeAll();
+
+            preferenceScreen.setOrderingAsAdded(true);
+            mThisDevicePref = new Preference(getActivity());
+            preferenceScreen.addPreference(mThisDevicePref);
+
+            mPeersGroup = new PreferenceCategory(getActivity());
+            mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
+            mPeersGroup.setEnabled(true);
+            preferenceScreen.addPreference(mPeersGroup);
+
+            startSearch();
+        }
+    }
+
+    private void updateSearchMenu(boolean searching) {
+       mWifiP2pSearching = searching;
+       Activity activity = getActivity();
+       if (activity != null) activity.invalidateOptionsMenu();
+    }
+
+    private void startSearch() {
+        if (mWifiP2pManager != null && !mWifiP2pSearching) {
+            mWifiP2pManager.discoverPeers(mChannel, new WifiP2pManager.ActionListener() {
+                public void onSuccess() {
+                    updateSearchMenu(true);
+                    //Allow 20s to discover devices
+                    mUiHandler.postDelayed(new Runnable() {
+                            public void run() {
+                                updateSearchMenu(false);
+                            }}, 20000);
+                }
+                public void onFailure(int reason) {
+                    if (DBG) Log.d(TAG, " discover fail " + reason);
+                    updateSearchMenu(false);
+                }
+            });
         }
     }
 
     private void updateDevicePref() {
-        mThisDevicePref = new Preference(getActivity());
-
         if (mThisDevice != null) {
             if (TextUtils.isEmpty(mThisDevice.deviceName)) {
                 mThisDevicePref.setTitle(mThisDevice.deviceAddress);
@@ -323,15 +365,9 @@
                 mThisDevicePref.setTitle(mThisDevice.deviceName);
             }
 
-            if (mThisDevice.status == WifiP2pDevice.CONNECTED) {
-                String[] statusArray = getActivity().getResources().getStringArray(
-                        R.array.wifi_p2p_status);
-                mThisDevicePref.setSummary(statusArray[mThisDevice.status]);
-            }
             mThisDevicePref.setPersistent(false);
             mThisDevicePref.setEnabled(true);
             mThisDevicePref.setSelectable(false);
         }
-        onPeersAvailable(mPeers); //update UI
     }
 }
diff --git a/tests/res/drawable-xhdpi/ic_settings_applications.png b/tests/res/drawable-xhdpi/ic_settings_applications.png
new file mode 100644
index 0000000..8eda83f
--- /dev/null
+++ b/tests/res/drawable-xhdpi/ic_settings_applications.png
Binary files differ
diff --git a/tests/res/drawable/ic_settings_applications.png b/tests/res/drawable/ic_settings_applications.png
deleted file mode 100755
index 5cea33f..0000000
--- a/tests/res/drawable/ic_settings_applications.png
+++ /dev/null
Binary files differ