Import revised translations.  DO NOT MERGE

Change-Id: Id19c294af4493e0d47193ab3477d5c0a1c068669
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index b2c8fbc..35c4312 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"عدم تنفيذ ذلك مطلقًا أثناء التوصيل"</item>
     <item msgid="6592896328877671197">"مطلقًا (استخدام المزيد من طاقة البطارية)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"عند إيقاف الشاشة"</item>
+    <item msgid="8137861573803398334">"عدم تنفيذ ذلك مطلقًا أثناء التوصيل"</item>
+    <item msgid="5996547094658157629">"مطلقًا (استخدام المزيد من طاقة البطارية)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"تلقائي"</item>
     <item msgid="6670588712989942178">"5 غيغاهيرتز فقط"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5a9329d..ae69021 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"تنبيهي عند توفر شبكة مفتوحة"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"سياسة قطع اتصال Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"تحديد وقت التبديل من Wi-Fi إلى بيانات الجوال"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"تحديد وقت الفصل من Wi-Fi."</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"حدثت مشكلة أثناء تغيير الإعدادات"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"إضافة شبكة Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"شبكات Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"الشبكة"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"عنوان Mac لـ Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"عنوان البلوتوث"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"الرقم المسلسل"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"غير متاح"</string>
     <string name="status_up_time" msgid="7294859476816760399">"وقت التشغيل"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"وقت الوضع النشط"</string>
@@ -728,7 +728,7 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"لمسح الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@aaf8358)  -->
+    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@5f1121f6)  -->
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"استخدام الشبكات اللاسلكية"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"عرض الموقع في التطبيقات (مثل الخرائط) باستخدام الشبكات اللاسلكية"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"الموقع محدد بواسطة Wi-Fi و/أو شبكات الجوال"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"استخدام الأقمار الصناعية لنظام تحديد المواقع العالمي GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"عند تحديد الموقع، التدقيق لمستوى الشارع"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"تحديد الموقع على مستوى الشارع (يتطلب المزيد من طاقة البطارية إلى جانب عرض السماء)"</string>
@@ -1384,7 +1383,7 @@
     <string name="sync_one_time_sync" msgid="6766593624598183090">"المس للمزامنة الآن<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <string name="sync_calendar" msgid="9056527206714733735">"تقويم"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"التقويم"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"جهات الاتصال"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"مرحبًا بك في مزامنة Google!"</font>" "\n"وهي الطريقة التي تتبعها Google لمزامنة البيانات للسماح بالدخول إلى جهات الاتصال والمواعيد والمزيد من أي مكان تتواجد فيه."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"إعدادات مزامنة التطبيق"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 7538f5e..f9b7883 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Никога при включено захранване"</item>
     <item msgid="6592896328877671197">"Никога (консумира повече енергия от батерията)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Когато екранът се изключи"</item>
+    <item msgid="8137861573803398334">"Никога при включено захранване"</item>
+    <item msgid="5996547094658157629">"Никога (хаби повече батерията)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Автоматично"</item>
     <item msgid="6670588712989942178">"Само на 5 GHz"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6abf88a..1368f48 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Известие при налична отворена мрежа"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Правила за изключване на Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Посочване на времето за превключване от Wi-Fi към мобилни данни"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Посочване на времето за прекратяване на връзката с Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Възникна проблем при промяна на настройката"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Добавете Wi-Fi мрежа"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мрежи"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Мрежа"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC адрес на Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес на Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Сериен номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Няма данни"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време на дейност"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време на активност"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Да се използват безжични мрежи"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Вижте местоположението в приложения (например Карти) чрез безжични мрежи"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Местоположението се определя чрез Wi-Fi и/или мобилни мрежи"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположението се определя чрез Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Използване на GPS спътници"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Установяването на местоположението е с точност до улици"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Откриване до ниво на улица (изисква повече батерия и изглед на небето)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Приложенията да синхр., пращат и получават данни винаги"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Внимание"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Деактивирането на данните на заден план удължава живота на батерията и намалява употребата на данни. Някои приложения могат пак да ползват връзката за данни на заден план."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Автоматично синхронизиране"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Автоматично синхронизиране"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Автосинхронизиране на данни от приложения"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Управление на профилите"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Синхр. е ВКЛЮЧЕНО"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Грешка при синхр."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Създаване на резервно копие на настройките"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Създаване на резервно копие на настройките ми"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхрон сега"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Отказ на синхронизиране"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхрон сега"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Анулиране на синхронизирането"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Докоснете, за да синхронизирате сега<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добре дошли в Google Синхронизиране!"</font>" "\n"Подходът на Google към синхронизирането на данни, за да ви осигурим достъп до контактите ви, срещите ви и много други неща, където и да сте."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Настройки за синхронизиране на приложения"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Данни и синхронизиране"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index b9f3bba..b5650cc 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Mai mentre estigui connectada"</item>
     <item msgid="6592896328877671197">"Mai (utilitza més bateria)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Quan s\'apagui la pantalla"</item>
+    <item msgid="8137861573803398334">"Mai mentre estigui connectada"</item>
+    <item msgid="5996547094658157629">"Mai (utilitza més bateria)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automàtic"</item>
     <item msgid="6670588712989942178">"Només 5 GHz"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0318929..c3a020e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notifica\'m quan hi hagi una xarxa oberta disponible"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desconnexió de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especifiqueu quan canviar de Wi-fi a dades mòbils"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especifica quan desconnectar de la Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"S\'ha produït un problema en canviar la configuració"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Afegeix una xarxa Wi-fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Xarxes Wi-fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Xarxa"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adreça MAC de Wi-fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adreça de Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de sèrie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Temps actiu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps d\'activació"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Utilitza les xarxes sense fil"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Mostra la ubicació a les aplicacions (com ara Mapes) mitjançant xarxes sense fil"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicació determinada per la xarxa Wi-fi i/o xarxes mòbils"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicació determinada per Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utilitza satèl·lits GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"En ubicar, precisió a nivell de carrer"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Ubica al nivell del carrer (requereix més bateria i visualitzar el cel)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Les aplicacions poden sincronitzar, enviar i rebre dades en qualsevol moment"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Atenció"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Desactivar les dades de fons augmenta la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions encara utilitzin la connexió de dades de fons."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Sincronització automàtica"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronització automàtica"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Les aplicacions sincronitzen dades automàticament"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Gestiona comptes"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronització ACTIVADA"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Error sincron."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Còpia de seguretat de la configuració"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Fes una còpia de seguretat de la configuració"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronitza ara"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancel·la la sincronització"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronitza ara"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancel·la la sincronització"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Toca per sincronitzar ara <xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Calendari"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Contactes"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Calendari"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contactes"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Benvingut a Google Sync!"</font>" "\n"La sincronització de dades que ha ideat Google per permetre l\'accés als contactes, a les cites i a molts més elements des de qualsevol lloc."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Configuració de la sincronització d\'aplicacions"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dades i sincronització"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 6c6e528..8debbf7 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -106,7 +106,7 @@
     <item msgid="8578370891960825148">"Neúspěšné"</item>
   </string-array>
   <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Otevřít"</item>
+    <item msgid="1435933968767043814">"Otevřená"</item>
     <item msgid="6318432659048829665">"WEP"</item>
     <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
     <item msgid="9098390198768443435">"802.1x EAP"</item>
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nikdy, je-li zapnuto napájení"</item>
     <item msgid="6592896328877671197">"Nikdy (spotřebuje se více energie baterie)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Při vypnutí obrazovky"</item>
+    <item msgid="8137861573803398334">"Nikdy, je-li zapnuto napájení"</item>
+    <item msgid="5996547094658157629">"Nikdy (spotřebuje se více energie baterie)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automaticky"</item>
     <item msgid="6670588712989942178">"Pouze 5 GHz"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2a90f31..2744b79 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Oznamovat dostupné nezabezpečené sítě"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Zásady odpojování sítě Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Určit, kdy přepnout ze sítě Wi-Fi na mobilní datový přenos"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Určete, kdy se má zařízení odpojit ze sítě Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Při změně nastavení se vyskytl problém"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Přidat síť WiFi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sítě WiFi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Síť"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresa MAC sítě WiFi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa zařízení Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nedostupný údaj"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba provozu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba provozu"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Zaměření přes bezdrátové sítě"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Zobrazuje polohu v aplikacích (jako Mapy) pomocí bezdrátových sítí"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Poloha je zaměřena pomocí WiFi nebo mobilních sítí"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Poloha určená sítí Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Použít satelity GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Zaměření je s přesností na úrovni ulic."</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Umožňuje zaměřit na úrovni ulic (vetší spotřeba baterie a nutný výhled na oblohu)"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index ebfbcc9..701452a 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Aldrig når tilsluttet"</item>
     <item msgid="6592896328877671197">"Aldrig (bruger mere batterikapacitet)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Når skærmen slukker"</item>
+    <item msgid="8137861573803398334">"Aldrig når tilsluttet"</item>
+    <item msgid="5996547094658157629">"Aldrig (bruger mere batteri)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatisk"</item>
     <item msgid="6670588712989942178">"Kun 5 GHz"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 34e5299..bd8f27c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -272,7 +272,7 @@
     <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="2150571569618349332">"Du kan kryptere dine konti, indstillinger, downloadede applikationer 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 udføre en nulstilling af fabriksdata. Derved slettes alle dine data."\n\n"Krypteringen tager én time eller mere. Du skal starte med et opladt batteri og sørge for, at din telefon forbliver tilsluttet, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste dine data delvist eller helt."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptere dine konti, indstillinger, downloadede programmer 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 udføre en nulstilling af fabriksdata. Derved slettes alle dine data."\n\n"Krypteringen tager én time eller mere. Du skal starte med et opladt batteri og sørge for, at din tablet forbliver tilsluttet, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste dine data delvist eller helt."</string>
     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere dine konti, indstillinger, downloadede applikationer 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 kun dekryptere den ved at udføre en nulstilling af fabriksdata. Derved slettes alle dine data."\n\n"Krypteringen tager én time eller mere. Du skal starte med et opladt batteri og sørge for, at din telefon forbliver tilsluttet, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste dine data delvist eller helt."</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>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Fortæl mig, når der er et tilgængeligt åbent netværk"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Politik for frakobling af Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Angiv, hvornår der skal skiftes fra Wi-Fi til mobile data"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Angiv, hvornår forbindelsen til Wi-Fi skal afbrydes"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Der opstod et problem ved ændring af indstillingen"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Tilføj Wi-Fi-netværk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netværk"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Netværk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-adresse for Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Utilgængelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Opvågningstid"</string>
@@ -733,7 +733,7 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Slet SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Slet alle data på det interne USB-lager, f.eks. musik og billeder."</string>
     <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Slet alle data på SD-kortet, f.eks. musik og billeder."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Nulstil tabletcomputeren"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Nulstil tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Nulstil telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Slet alle dine personlige oplysninger og downloadede programmer? Denne handlíng kan ikke fortrydes."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Slet alt"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Brug trådløse netværk"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Se placering i programmer (som f.eks. Maps) ved hjælp af trådløse netværk"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Placering afgøres af Wi-Fi og/eller mobilnetværk"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Placeringen fastlægges af Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Brug GPS-satellitter"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Præcis placering på gadeplan"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Placering på gadeplan (mere batterikrævende, skal bruges i det fri)"</string>
@@ -1078,7 +1077,7 @@
     <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tilgængelighedsscripts"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Download tilgængelighedsscripts"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillad, at programmer henter tilgængelighedsscripts fra Google"</string>
-    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Nogle programmer kan bede Google om at downloade scripts til din tabletcomputer, som gør deres indhold mere tilgængeligt. Vil du tillade, at Google installerer tilgængelighedsscripts på din tabletcomputer?"</string>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Nogle programmer kan bede Google om at downloade scripts til din tablet, som gør deres indhold mere tilgængeligt. Vil du tillade, at Google installerer tilgængelighedsscripts på din tablet?"</string>
     <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Nogle programmer kan bede Google om at downloade scripts til din telefon, som gør deres indhold mere tilgængeligt. Vil du tillade, at Google installerer tilgængelighedsscripts på din telefon?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Afbryderknap"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Afbryderknappen afslutter opkaldet"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 5d984a0..9956112 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Niemals, wenn im Netzbetrieb"</item>
     <item msgid="6592896328877671197">"Nie (erfordert mehr Akkuleistung)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Wenn Bildschirm sich abschaltet"</item>
+    <item msgid="8137861573803398334">"Niemals, wenn im Netzbetrieb"</item>
+    <item msgid="5996547094658157629">"Nie (erfordert mehr Akkuleistung)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatisch"</item>
     <item msgid="6670588712989942178">"Nur 5 GHz"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a3e7f97..fd24746 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -198,7 +198,7 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-Karte wird als Massenspeichergerät verwendet"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-Speicher kann nun entfernt werden"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Die SD-Karte kann jetzt entfernt werden."</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher wurde während Verw. entfernt."</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher während Verwendung entfernt"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Die SD-Karte wurde während der Verwendung entfernt!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Verwendete Bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-Sp. auf Medien scannen"</string>
@@ -226,7 +226,7 @@
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Drahtlosverbindungen werden deaktiviert..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Drahtlosverbindungen werden aktiviert..."</string>
     <string name="radio_controls_title" msgid="5868688473587168882">"Drahtlos &amp; Netzwerke"</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Drahtlos und Netzwerke"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Drahtlos &amp; Netzwerke"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
     <string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Bei Roaming mit Datendienst verbinden"</string>
@@ -241,7 +241,7 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Datum und Uhrzeit einstellen"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Datum, Uhrzeit, Zeitzone und Formate festlegen"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatisches Datum &amp; Uhrzeit"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Vom Netzwerk angegebene Zeitzone verwenden"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Zeit aus Netzwerk beziehen"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Zeit aus Netzwerk beziehen"</string>
     <string name="zone_auto" msgid="334783869352026648">"Automatische Zeitzone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Vom Netzwerk angegebene Zeitzone beibehalten"</string>
@@ -272,7 +272,7 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Zur Entschlüsselung Ihres Tablets muss bei jedem Einschalten eine numerische PIN oder ein Passwort eingegeben werden."</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Zur Entschlüsselung Ihres Telefons muss bei jedem Einschalten eine numerische PIN oder ein Passwort eingegeben werden."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Anwendungen 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 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 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="tablet" msgid="2150571569618349332">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Anwendungen 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 die 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="7366703764847750586">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Anwendungen und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Geräts müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Geräts 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_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon verschlüsseln"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Benachrichtigen, wenn ein offenes Netzwerk verfügbar ist"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"WLAN-Standby-Richtlinie"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Festlegen, wann von WLAN auf mobile Daten umgeschaltet werden soll"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Legen Sie fest, wann die WLAN-Verbindung getrennt werden soll."</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Beim Ändern der Einstellung ist ein Problem aufgetreten."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"WLAN-Netzwerk hinzufügen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"WLAN-Netzwerke"</string>
@@ -516,7 +517,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Töne"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Bildschirm"</string>
+    <string name="display_settings_title" msgid="2378894265964357591">"Display"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Toneinstellungen"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Lautlosmodus"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Alle Töne (außer für Wecker &amp; Medienwiedergabe) stummschalten"</string>
@@ -546,11 +547,11 @@
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Töne bei Telefonwahl"</string>
     <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Töne bei Telefonwahl"</string>
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Akustische Auswahl"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Ton bei Auswahl auf Bildschirm"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Ton bei Auswahl auf Bildschirm"</string>
+    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Ton bei Auswahl auf Display"</string>
+    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Ton bei Auswahl auf Display"</string>
     <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Display-Sperre"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Ton beim Sperren und Entsperren des Bildschirms"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Ton beim Sperren und Entsperren des Bildschirms"</string>
+    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Ton beim Sperren und Entsperren des Displays"</string>
+    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Ton beim Sperren und Entsperren des Displays"</string>
     <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptisches Feedback"</string>
     <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibration beim Drücken von Softkeys und bei bestimmten UI-Interaktionen"</string>
     <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibration beim Drücken von Softkeys und bei bestimmten UI-Interaktionen"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Netzwerk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"WLAN-MAC-Adresse"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-Adresse"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Seriennummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nicht verfügbar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Betriebszeit"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktivzeit"</string>
@@ -657,7 +657,7 @@
     <string name="memory_calculating_size" msgid="2188358544203768588">"Berechnen…"</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Anwendungen"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medien"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Freig. Speicher trennen"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gem. Speicher trennen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Internen USB-Speicher trennen"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-Karte trennen, damit Sie sie sicher entfernen können"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Drahtlosnetzwerke"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Standort über Drahtlosnetzwerke bestimmen (z. B. in Google Maps)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Standort über WLAN und/oder Mobilfunknetze bestimmen"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Standort per WLAN bestimmt"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS-Satelliten"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Genau auf Straßenebene lokalisieren"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
@@ -805,7 +804,7 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server zur Unterstützung von GPS verwenden (zur Verbesserung der GPS-Leistung deaktivieren)"</string>
     <string name="use_location_title" msgid="3659340070401464551">"Standort für Google-Suche verwenden"</string>
     <string name="use_location_summary_disabled" msgid="6518008620918354403">"Standort für Google-Suche und andere Google-Services verwenden"</string>
-    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Standort wird zur Verbesserung der Google-Suchergebnisse und anderer Google-Services verwendet."</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Standort wird zur Verbesserung der Google-Suchergebnisse und anderer Google-Dienste verwendet."</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Über das Tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Über das Telefon"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Rechtliche Hinweise, Status und Softwareversion anzeigen"</string>
@@ -1078,7 +1077,7 @@
     <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skripts für Eingabehilfen"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Skripts für Eingabehilfen herunterladen"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Anwendungen dürfen Eingabehilfenskripts von Google herunterladen."</string>
-    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Einige Anwendungen können Google auffordern, Skripts auf Ihr Tablet herunterzuladen, um den Zugriff auf deren Inhalte zu erleichtern. Sind Sie sicher, dass Sie Google gestatten möchten, Skripts für Eingabehilfen auf Ihrem Tablet zu installieren?"</string>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Einige Anwendungen können Google auffordern, Skripts auf Ihr Tablet herunterzuladen, um den Zugriff auf deren Inhalte zu erleichtern. Sind Sie sicher, dass Sie Google erlauben möchten, Skripts für Eingabehilfen auf Ihrem Tablet zu installieren?"</string>
     <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Einige Anwendungen können Google auffordern, Skripts auf Ihr Telefon herunterzuladen, um den Zugriff auf deren Content zu erleichtern. Sind Sie sicher, dass Sie Google gestatten möchten, Skripts für Eingabehilfen auf Ihrem Telefon zu installieren?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Ein-/Austaste"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Ein-/Austaste beendet Anruf"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index b39e41a..77ab6c6 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Ποτέ όταν είναι συνδεδεμένο"</item>
     <item msgid="6592896328877671197">"Ποτέ (κάνει χρήση μεγαλύτερης ισχύος της μπαταρίας)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Όταν η οθόνη απενεργοποιείται"</item>
+    <item msgid="8137861573803398334">"Ποτέ όταν είναι στο ρεύμα"</item>
+    <item msgid="5996547094658157629">"Ποτέ (κάνει χρήση μεγαλύτερης ισχύος της μπαταρίας)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Αυτόματο"</item>
     <item msgid="6670588712989942178">"Μόνο 5 GHz"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 59a079f..218db5d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -269,7 +269,7 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Κρυπτογράφηση"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Κρυπτογράφηση τηλεφώνου"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του tablet σας κάθε φορά που το ενεργοποιείτε"</string>
+    <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="2150571569618349332">"Μπορείτε να κάνετε κρυπτογράφηση λογαριασμών, ρυθμίσεων, εφαρμογών των οποίων έχετε πραγματοποιήσει λήψη και των δεδομένων, των μέσων και άλλων αρχείων τους. Μόλις κρυπτογραφήσετε το tablet σας, θα πρέπει να εισαγάγετε έναν αριθμητικό κωδικό PIN ή έναν κωδικό πρόσβασης για να το αποκρυπτογραφείτε κάθε φορά που το ενεργοποιείτε: δεν μπορείτε να αποκρυπτογραφήσετε το tablet σας, εκτός αν κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μία ώρα ή περισσότερο. Πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και το tablet σας θα πρέπει να παραμείνει συνδεδεμένο μέχρι να ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία της κρυπτογράφησης, θα χάσετε όλα ή κάποια από τα δεδομένα σας."</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Να ειδοποιούμαι όταν υπάρχει διαθέσιμο ανοικτό δίκτυο"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Πολιτική αποσύνδεσης Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Ορισμός εναλλαγής από δεδομένα Wi-Fi σε δεδομένα κινητού"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Καθορίστε πότε θα γίνει αποσύνδεση από το Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Προέκυψε κάποιο πρόβλημα κατά την αλλαγή της ρύθμισης"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Προσθήκη δικτύου Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Δίκτυα Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Δίκτυο"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Διεύθυνση MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Διεύθυνση Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Σειριακός αριθμός"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Μη διαθέσιμο"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Χρόνος από την τελευταία εκκίνηση"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Χρόνος αφύπνισης"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Χρήση ασύρματων δικτύων"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Προβ.τοποθ.σε εφαρμ.(όπως π.χ. στους Χάρτες) με χρήση ασύρ.δικτ."</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Η τοποθ.προσδ.από δίκτ.Wi-Fi και/ή δίκτ.κινητ.τηλεφ."</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Χρήση δορυφόρων GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Κατά την εύρεση τοποθεσίας, η ακρίβεια είναι σε επίπεδο δρόμου"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Εντοπ.σε επίπ.δρόμου (απαιτ.μεγ.καταν.μπαταρ.και μετάβ.σε ανοικτό χώρο)"</string>
@@ -1078,7 +1077,7 @@
     <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Σενάρια προσβασιμότητας"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Λήψη σεναρίων προσβασιμότητας"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Να επιτρ. στις εφ/γές η λήψη σεναρίων προσβ/τας από την Google"</string>
-    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Ορισμένες εφαρμογές ενδέχεται να ζητήσουν από την Google τη λήψη σεναρίων στον υπολογιστή tablet σας, τα οποία κάνουν το περιεχόμενό τους πιο προσβάσιμο. Είστε βέβαιοι ότι θέλετε να επιτρέψετε στην Google να εγκαθιστά σενάρια προσβασιμότητας στον υπολογιστή tablet σας;"</string>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Ορισμένες εφαρμογές ενδέχεται να ζητήσουν από την Google τη λήψη σεναρίων στο  tablet σας, τα οποία κάνουν το περιεχόμενό τους πιο προσβάσιμο. Είστε βέβαιοι ότι θέλετε να επιτρέψετε στην Google να εγκαθιστά σενάρια προσβασιμότητας στο tablet σας;"</string>
     <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Ορισμένες εφαρμογές ενδέχεται να ζητήσουν από την Google τη λήψη σεναρίων στο τηλέφωνό σας, τα οποία κάνουν το περιεχόμενό τους πιο προσβάσιμο. Θέλετε σίγουρα να επιτρέψετε στην Google να εγκαθιστά σενάρια προσβασιμότητας στο τηλέφωνό σας;"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Κουμπί λειτουργίας"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Το κουμπί λειτουργίας τερματίζει τις κλήσεις"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 8d99e92..b4e3c48 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Never when plugged in"</item>
     <item msgid="6592896328877671197">"Never (uses more battery power)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"When screen is turned off"</item>
+    <item msgid="8137861573803398334">"Never when plugged in"</item>
+    <item msgid="5996547094658157629">"Never (uses more battery power)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Auto"</item>
     <item msgid="6670588712989942178">"5 GHz only"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 81fb836..80acc59 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notify me when an open network is available"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi disconnection policy"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Specify when to switch from Wi-Fi to mobile data"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Specify when to disconnect from Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Add WiFi network"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi networks"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Network"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Use wireless networks"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"See location in applications (such as Maps) using wireless networks"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Location determined by Wi-Fi and/or mobile networks"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Location determined by Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Use GPS satellites"</string>
     <string name="location_street_level" msgid="7456259025474443314">"When locating, accurate to street level"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Locate to street level (requires more battery plus view of sky)"</string>
@@ -1383,7 +1382,7 @@
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancel sync"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Touch to sync now<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <string name="sync_gmail" msgid="714886122098006477">"Google Mail"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contacts"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Welcome to Google Sync!"</font>" "\n"A Google approach to synchronising data to allow access to your contacts, appointments and more, wherever you are."</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 6c7e4fd..9f283f0 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nunca cuando está conectado"</item>
     <item msgid="6592896328877671197">"Nunca (consume más batería)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Cuando se apaga la pantalla"</item>
+    <item msgid="8137861573803398334">"Nunca cuando está conectado"</item>
+    <item msgid="5996547094658157629">"Nunca (consume más batería)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automáticamente"</item>
     <item msgid="6670588712989942178">"Sólo 5 GHz"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ff115fd..ba47b60 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -30,7 +30,7 @@
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Sólo llamadas de emergencia"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio apagada"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming"</string>
-    <string name="radioInfo_roaming_not" msgid="2851853244069662307">"No hay roaming"</string>
+    <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Sin roaming"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Inactivo"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Timbrando"</string>
     <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"Llamada en curso"</string>
@@ -75,7 +75,7 @@
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Descargando"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se realiza la carga"</string>
-    <string name="battery_info_status_full" msgid="2824614753861462808">"Total"</string>
+    <string name="battery_info_status_full" msgid="2824614753861462808">"Cargada"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconectado"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
@@ -94,10 +94,10 @@
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer que el dispositivo sea visible"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir el uso de Bluetooth del teléfono cuando la pantalla esté bloqueada."</string>
-    <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos de Bluetooth"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nombre del dispositivo"</string>
-    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No hay nombre establecido, se utiliza el nombre de cuenta"</string>
-    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Explorar dispositivos"</string>
+    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No se ha establecido ningún nombre; se utiliza el nombre de cuenta"</string>
+    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Buscar dispositivos"</string>
     <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Se desconectará <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
@@ -116,7 +116,7 @@
     <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Mostrar la lista de datos recibidos por Bluetooth"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Una aplicación de tu tablet solicita permiso para activar Bluetooth. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Una aplicación solicita permiso para activar Bluetooth. ¿Deseas activarlo?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Una aplicación de tu tablet solicita permiso para hacer que tu tablet pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Una aplicación de tu tablet solicita permiso para activar Bluetooth y hacer que tu tablet pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
@@ -182,7 +182,7 @@
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Actualizar"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Actualizar"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Cambiar la verificación de DNS"</string>
-    <string name="oem_radio_info_label" msgid="6163141792477958941">"Información específica a OEM/Configuración"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"Configuración/Información específica a OEM"</string>
     <string name="band_mode_title" msgid="954174198903776205">"Establecer banda GSM y UMTS"</string>
     <string name="band_mode_loading" msgid="548764766363847336">"Cargando lista de banda..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Establecer"</string>
@@ -225,7 +225,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desactivar todas las conexiones inalámbricas"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Desactivando conexiones inalámbricas…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Activando conexiones inalámbricas…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Redes y wireless"</string>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Conexiones inalámbricas y redes"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes inalámbricas y redes"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Administrar Wi-Fi, Bluetooth, modo de avión, redes, móviles, &amp; VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de datos"</string>
@@ -254,14 +254,14 @@
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
-    <string name="time_picker_title" msgid="483460752287255019">"Tiempo"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="lock_after_timeout" msgid="940509402681580537">"Tiempo de espera"</string>
     <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Bloquear pantalla <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> luego de que la pantalla se apague automáticamente"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar la información del propietario en el bloqueo de la pantalla"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar datos de propietario en pantalla de bloqueo"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Datos propietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Ingresa el texto para la pantalla de bloqueo."</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Seguridad y ubicación"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Ubicación y seguridad"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Configuración de ubicación y seguridad"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de la credencial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
@@ -293,29 +293,29 @@
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"La encriptación falló"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"La encriptación se interrumpió y no se puede completar. Debes restablecer la configuración de fábrica (a través del borrado de tus datos) para poder usar tu tableta de nuevo. Puedes intentar encriptar tu tableta otra vez luego de que la configuración de fábrica se restablezca por completo."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"La encriptación se interrumpió y no se puede completar. Debes restablecer la configuración de fábrica (a través del borrado de tus datos) para poder usar tu teléfono de nuevo. Puedes intentar encriptar tu teléfono otra vez luego de que la configuración de fábrica se restablezca por completo."</string>
-    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurar el bloqueo de pantalla"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurar bloqueo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurar el bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Cambiar bloqueo de la pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambia o inhabilita el patrón, PIN o la contraseña de seguridad."</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambiar/inhab. patrón/PIN/contraseña"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Elige un método para bloquear la pantalla."</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Apagado"</string>
     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Nunca bloquear la pantalla"</string>
     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Sin asegurar"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"No se necesita un patrón, PIN o contraseña para desbloquear la pantalla"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Desbloqueo sin patrón, PIN ni contraseña"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patrón"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Solicitar un patrón para desbloquear la pantalla"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Patrón para desbloquear la pantalla requerido."</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Requieren un PIN numérico para desbloquear la pantalla"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Solicitar una contraseña para desbloquear la pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Inhabilitado por el administrador remoto del tablet"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Inhabilitado por admin. de disp. remoto"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desactivado"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Sin seguros"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Asegurado con el patrón"</string>
     <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_disable_lock_title" msgid="1427036227416979120">"Desactivar el bloqueo de pantalla"</string>
-    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar el gráfico de desbloqueo"</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>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eliminar la contraseña de desbloqueo"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón de desbloqueo"</string>
@@ -329,7 +329,7 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no puede tener más de %d dígitos."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN debe contener de 0 a 9 dígitos únicamente."</string>
     <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"El administrador de dispositivos no permite utilizar un PIN reciente"</string>
-    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contraseña tiene un caracter no admitido."</string>
+    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contraseña tiene un carácter no admitido."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"La contraseña debe contener al menos una letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"La contraseña debe contener al menos un dígito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"La contraseña debe contener al menos un símbolo."</string>
@@ -364,7 +364,7 @@
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Siguiente"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración del dispositivo"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administradores del dispositivo."</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar administradores del dispositivo"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar los administradores de dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Config. de Bluetooth"</string>
@@ -385,7 +385,7 @@
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"No es posible establecer la comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vínculo rechazado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Se ha producido un problema al conectarse con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Explorar dispositivos"</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Buscar dispositivos"</string>
     <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Buscar dispositivos cercanos"</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Configuración de dispositivos"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos vinculados"</string>
@@ -441,14 +441,15 @@
     <string name="wifi_stopping" msgid="5952909472548218348">"Desactivando..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"En modo de avión"</string>
-    <string name="wifi_fail_to_scan" msgid="6194542252808587669">"No se han podido explorar las redes"</string>
+    <string name="wifi_fail_to_scan" msgid="6194542252808587669">"No se han podido buscar redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificación de red"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificarme cuando se encuentre disponible una red abierta"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desconexión de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especificar cuándo se debe cambiar de Wi-Fi a datos de celular"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especificar cuándo desconectar de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Hubo un problema mientras se cambiaba la configuración"</string>
-    <string name="wifi_add_network" msgid="1671334951296205616">"Agregar red de Wi-Fi"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Redes de Wi-Fi"</string>
+    <string name="wifi_add_network" msgid="1671334951296205616">"Agregar red Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Explorar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzado"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
@@ -457,7 +458,7 @@
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configuración de red"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Ingresar pin de punto de acceso"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configuración de WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Ingrese el pin <xliff:g id="WPS_PIN">%1$s</xliff:g> en el punto de acceso."</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Ingresa el pin <xliff:g id="WPS_PIN">%1$s</xliff:g> en el punto de acceso."</string>
     <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS está en progreso y puede demorar varios segundos hasta completarse"</string>
     <string name="wifi_wps_failed" msgid="2277409652621482331">"Falló el inicio de WPS, inténtalo nuevamente"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de red"</string>
@@ -466,7 +467,7 @@
     <string name="wifi_status" msgid="4824568012414605414">"Estado"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidad del vínculo"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string>
-    <string name="wifi_eap_method" msgid="8529436133640730382">"Método de EAP"</string>
+    <string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado del usuario"</string>
@@ -479,11 +480,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sin especificar)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Recordado"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Desactivado"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera del alcance"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de alcance"</string>
     <string name="wifi_open_with_wps" msgid="2606968531452521147">"WSP disponible"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Asegurado con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured" msgid="6759903183748011566">"Protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Protegido con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS disponible)"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, asegurado con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
@@ -493,19 +494,19 @@
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especificar el rango de frecuencia de la operación"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problema al configurar la banda de frecuencias."</string>
-    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección de MAC"</string>
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Dirección IP"</string>
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Configuración de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Guardar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Escribe una dirección IP válida."</string>
-    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Escribe una dirección válida de la puerta de enlace."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Escribe una dirección válida para la puerta de enlace."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Escribe una dirección DNS válida."</string>
-    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Escribe una longitud de prefijo de la red de entre 0 y 32."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Escribe una longitud de prefijo de red entre 0 y 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Acceso"</string>
-    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefijo de la red"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefijo de red"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona activa Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona activa portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> conectada"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error en la zona activa Wi-Fi portátil"</string>
@@ -549,8 +550,8 @@
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproducir el sonido al realizar la selección de pantalla"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproducir el sonido al realizar la selección de pantalla"</string>
     <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sonidos de bloqueo de pantalla"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproducir canciones al bloquear o desbloquear la pantalla"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproducir canciones al bloquear o desbloquear la pantalla"</string>
+    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproducir sonidos al bloquear o desbloquear la pantalla"</string>
+    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproducir sonidos al bloquear o desbloquear la pantalla"</string>
     <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Respuesta táctil"</string>
     <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar al presionar teclas programables y ciertas interacciones de interfaz de usuario"</string>
     <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar al presionar teclas programables y ciertas interacciones de interfaz de usuario"</string>
@@ -568,10 +569,10 @@
     <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"El tablet debe estar en la base p conf el audio de la base"</string>
     <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"El teléfono debe estar en la base para configurar el audio de la base."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Sonido al acoplar"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido cuando se inserte o elimine el tablet de la estación."</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido cuando se inserte o elimine un teléfono desde acoplar."</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido cuando se inserte o elimine un tablet de la estación."</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido cuando se inserte o elimine un teléfono desde acoplar."</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>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido cuando se inserte o elimine un tablet de la base."</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o retirar el teléfono de la base."</string>
     <string name="sync_settings" msgid="9186125469300013491">"Cuentas y sincronización"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Agregar o eliminar cuentas, y cambiar la configuración de la cuenta"</string>
     <string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
@@ -606,8 +607,8 @@
     <string name="sim_enter_new" msgid="8742727032729243562">"Nuevo PIN de SIM"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Volver a escribir el PIN nuevo"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN de SIM"</string>
-    <string name="sim_bad_pin" msgid="2746201276896134075">"¡PIN incorrecto!"</string>
-    <string name="sim_pins_dont_match" msgid="4664611595579163214">"¡Los PIN no coinciden!"</string>
+    <string name="sim_bad_pin" msgid="2746201276896134075">"PIN incorrecto"</string>
+    <string name="sim_pins_dont_match" msgid="4664611595579163214">"Los códigos PIN no coinciden"</string>
     <string name="sim_change_failed" msgid="4823538458798362222">"No se ha podido cambiar el PIN."\n"PIN posiblemente incorrecto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"El PIN de SIM se ha cambiado correctamente"</string>
     <string name="sim_lock_failed" msgid="6676748290838006404">"No se ha podido cambiar el estado de bloqueo de la tarjeta SIM. "\n"PIN posiblemente incorrecto."</string>
@@ -619,8 +620,8 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
     <string name="model_number" msgid="3765737700545384794">"Número de modelo"</string>
-    <string name="baseband_version" msgid="1848990160763524801">"Versión de banda de base"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"Versión núcleo"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Versión de núcleo"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
@@ -644,10 +645,9 @@
     <string name="status_operator" msgid="2274875196954742087">"Red"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Dirección MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
-    <string name="status_up_time" msgid="7294859476816760399">"Hora productiva"</string>
+    <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividad"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Almacenamiento USB"</string>
@@ -661,7 +661,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar la tarjeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desmontar el almacenamiento USB interno"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desmonta la tarjeta SD para que puedas extraerla de forma segura"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insertar almacenamiento USB para el montaje"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inserta USB"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Activar el almacenamiento USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montar tarjeta SD"</string>
@@ -718,8 +718,8 @@
     <string name="error_mcc_not3" msgid="4560171714156251661">"El campo de MCC debe contener 3 dígitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"El campo MNC debe contener 2 ó 3 dígitos."</string>
     <string name="restore_default_apn" msgid="2724583218635739913">"Restaurando la configuración APN predeterminada"</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Restablecer a la forma predeterminada"</string>
-    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Restablecimiento completado de configuración de APN predeterminada"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Restablecimiento de configuración de APN predeterminada completado"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restabl. datos de fábrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos del tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borra todos los datos del teléfono"</string>
@@ -734,15 +734,15 @@
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Borrar todos los datos del almacenamiento USB, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Borra todos los datos de la tarjeta SD, como la música o las fotos."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
-    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer el teléfono"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"¿Deseas borrar toda tu información personal y cualquier aplicación descargada?"</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 extraer tu gráfico de desbloqueo para confirmar el restablecimiento del tablet."</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_failed" msgid="8655202125010189406">"No se ha realizado ningún restablecimiento debido a que el servicio \"Borrar sistema\" no se encuentra disponible."</string>
     <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirmar restablecimiento"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
-    <string name="media_format_title" product="default" msgid="4427528440306787972">"Borrar la tarjeta SD"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Borrar tarjeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Borra todos los datos del almacenamiento USB"</string>
     <string name="media_format_summary" product="default" msgid="3805714639375830120">"Borra todos los datos en la tarjeta SD"</string>
     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Esta acción borrará el almacenamiento USB. ¡Perderás "<b>"todos"</b>" los datos almacenados allí!"</string>
@@ -753,15 +753,15 @@
     <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"¿Deseas borrar la tarjeta SD y eliminar todos los archivos almacenados allí? ¡Esta acción no se puede cambiar!"</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 establecer el gráfico de desbloqueo para confirmar que deseas borrar el almacenamiento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes establecer el gráfico de desbloqueo para confirmar que deseas borrar la tarjeta SD."</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="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>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona activa portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Anclaje a red Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Anclaje a red"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Anclaje a red &amp; y zona activa portátil"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Anclaje a red y zona activa portátil"</string>
     <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Comparte la conexión de datos para celulares de tu tablet a través de USB"</string>
     <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Comparte la conexión de datos para celulares de tu teléfono a través de USB"</string>
     <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Comparte la conexión para celulares como una zona activa Wi-Fi portátil"</string>
@@ -795,11 +795,10 @@
     <string name="location_network_based" msgid="8815705866861993344">"Utilizar redes inalám."</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Ver ubicación en las aplicaciones (como Mapas) mediante redes inalámbricas"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicación determinada por Wi-Fi o redes de celulares"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites de GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Cuando se está ubicando, que sea preciso hasta el nivel de la calle."</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localiz. a nivel de calle (nec. más batería además de la vista del cielo)"</string>
+    <string name="location_street_level" msgid="7456259025474443314">"Ubicación precisa a nivel de calle"</string>
+    <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir el GPS (anular la selección para reducir el uso de la red)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir el GPS (anula la selección para mejorar el rendimiento del GPS)"</string>
@@ -817,7 +816,7 @@
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial del sistema"</string>
     <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Aprende cómo utilizar tu tablet"</string>
     <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Aprende cómo utilizar tu teléfono"</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"Abrir licencias de origen"</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Hay un problema para cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguridad"</string>
@@ -842,7 +841,7 @@
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar el patrón guardado"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="5629093548611791080">"Lo sentimos, vuelve a intentarlo:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Extraer un patrón de desbloqueo"</string>
-    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Presiona el Menú para obtener ayuda."</string>
+    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Presiona Menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Sacar el dedo cuando haya finalizado."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectar al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Vuelve a intentarlo."</string>
     <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"¡Patrón grabado!"</string>
@@ -865,7 +864,7 @@
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
     <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">"Asegurando tu teléfono"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Protección de tu teléfono"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protege tu tableta del uso no autorizado creando un gráfico de desbloqueo de pantalla personal. Usa el dedo para unir los puntos en cualquier orden en la pantalla. Debes unir al menos cuatro puntos."\n\n"¿Listo para comenzar? Toca “Siguiente”."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protege a tu teléfono de usos no autorizados al crear un patrón de desbloqueo en la pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la pantalla siguiente, observa cómo se extrae un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés listo, extrae tu propio patrón de desbloqueo personal. Experimenta con diferentes patrones pero conecta al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Revisa tu patrón para confirmar. "\n<font height="17">\n</font><b>"¿Estás listo para comenzar? Toca \"Siguiente\""</b>". "\n<font height="3">\n</font>"Si deseas dejar sin protección a tu teléfono, toca \"Cancelar\"."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administrar aplicaciones"</string>
@@ -916,7 +915,7 @@
     <string name="no_applications" msgid="5190227407135243904">"No hay aplicaciones."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
-    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Desmontar tarjeta SD"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Almacenamiento en tarjeta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando el tamaño…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Eliminar"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos los datos de esta aplicación se suprimirán de forma permanente. Esto incluye todos los archivos, las configuraciones, las cuentas, las bases de datos, etc."</string>
@@ -943,7 +942,7 @@
     <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"No queda suficiente espacio de almacenamiento."</string>
     <string name="does_not_exist" msgid="837163572898468245">"La aplicación no existe."</string>
-    <string name="app_forward_locked" msgid="5747805144210389585">"La aplicación está protegida por derecho de autor."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"La aplicación está protegida contra copia."</string>
     <string name="invalid_location" msgid="4934491353200240499">"La ubicación específica de la instalación no es válida."</string>
     <string name="system_package" msgid="1030561474413022831">"Las actualizaciones del sistema no se pueden instalar en medios externos."</string>
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forzar la detención"</string>
@@ -958,7 +957,7 @@
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver y controlar servicios actuales en ejecución"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Volver a comenzar"</string>
     <string name="cached" msgid="1059590879740175019">"Proceso de fondo almacenado en memoria caché"</string>
-    <string name="no_running_services" msgid="2059536495597645347">"No hay nada activo."</string>
+    <string name="no_running_services" msgid="2059536495597645347">"No hay nada en ejecución."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Comenzado por aplicación."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
@@ -1008,7 +1007,7 @@
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agregar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Agregar al diccionario"</string>
-    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Editar trabajo"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modificar palabra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
     <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"El diccionario del usuario no contiene ninguna palabra. Puedes agregar una palabra a través del menú."</string>
@@ -1042,7 +1041,7 @@
     <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Seleccionar métodos de entrada activos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración del teclado en pantalla"</string>
     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado incorporado"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Configuración del teclado físico incorporada"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Configuración del teclado físico integrado"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Establecer opciones para desarrollar aplicaciones"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuración de USB"</string>
@@ -1051,7 +1050,7 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca quedará inactiva mientras se realiza la carga"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir ubic. de prueba"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubic. de prueba"</string>
-    <string name="adb_warning_title" msgid="6234463310896563253">"¿Permite la depuración de USB?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración de USB?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"La depuración de USB está prevista sólo con fines de desarrollo. Se puede utilizar para copiar datos entre tu computadora y tu dispositivo, instalar aplicaciones en tu dispositivo sin aviso y leer los datos de registro."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Elegir gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Elegir control"</string>
@@ -1094,7 +1093,7 @@
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla encendida"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS encendido"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
-    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Encender"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Activa"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Señal de la red de celulares"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
@@ -1104,13 +1103,13 @@
     <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">"Detalles del historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Utilizar detalles"</string>
-    <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalles"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar el uso de energía"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
     <string name="power_screen" msgid="2353149143338929583">"Pantalla"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Célula pendiente"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Dispositivo inactivo"</string>
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ausente"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
@@ -1125,8 +1124,8 @@
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"Hora de encendido"</string>
-    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Hora sin una señal"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo de activación"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tiempo sin una señal"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar la detención"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Información de aplicación"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Configuración de aplicaciones"</string>
@@ -1164,14 +1163,14 @@
     <string name="recognizer_title" msgid="3231385184559054457">"Reconocedor de voz"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Reconocimiento de voz"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configuraciones para \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configuración de texto de voz"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Configuración de texto a voz"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Configuración de texto a voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar siempre mi config."</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Config. predet. debajo de la config. superpuesta de la aplicación"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
     <string name="tts_default_synth_title" msgid="29467896463371992">"Motor predeterminado"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"Configura el motor de síntesis de voz para utilizarse en textos hablados."</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Índice de voz"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocidad de voz"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidad en la que se habla el texto"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Sonido"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el tono del texto hablado"</string>
@@ -1240,7 +1239,7 @@
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Agregar VPN"</string>
     <string name="vpn_details_title" msgid="418806440938510331">"Detalles de VPN"</string>
     <string name="vpn_edit_title_add" msgid="2121313217989682890">"Agregar <xliff:g id="NAME">%s</xliff:g> VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> detalles"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalles de <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpns" msgid="3148141862835492816">"VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Conectando..."</string>
     <string name="vpn_disconnecting" msgid="7748050200708257066">"Desconectando..."</string>
@@ -1254,7 +1253,7 @@
     <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado del usuario"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificado de usuario"</string>
     <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Establecer certificado de CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado de autoridad (CA) certificado"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado de entidad emisora de certificados (CA)"</string>
     <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"un certificado de CA"</string>
     <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Establecer secreto de L2TP"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secreto de L2TP"</string>
@@ -1296,14 +1295,14 @@
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ingresar la contraseña para el almacenamiento de la credencial."</string>
     <string name="credentials_password_hint" msgid="4915128717409363024">"Establecer la contraseña para el almacenamiento de la credencial. Debe tener al menos 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nueva contraseña:"</string>
+    <string name="credentials_new_password" msgid="267487774686796938">"Contraseña nueva:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar contraseña nueva:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Se eliminarán todos los contenidos, y la contraseña se restablecerá. ¿Estás seguro de eso?"</string>
     <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener 8 caracteres como mínimo."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta."</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que el almacenamiento de la credencial se borre."</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contraseña incorrecta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más antes de que el almacenamiento de la credencial se borre."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de la credencial."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contraseña incorrecta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más antes de  que se borre el almacenamiento de la credencial."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"El almacenamiento de la credencial se ha borrado."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de la credencial está activado."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
@@ -1337,7 +1336,7 @@
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Comentarios"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"Configurar Wi-Fi"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Conectar a una red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Conectando a una red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Conectando a la red Wi-Fi de <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
     <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado a una red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Agregar una red"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"No conectado"</string>
@@ -1358,7 +1357,7 @@
     <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ingresar configuración de red"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectar a la red nueva"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
-    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Proceder con el siguiente paso"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Continuar con el paso siguiente"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP no es compatible"</string>
     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"No puedes configurar la conexión Wi-Fi de EAP durante la instalación. Después de la instalación, puedes hacerlo en Configuraciones, en "<b>"Redes inalámbricas &amp;"</b>"."</string>
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La conexión puede demorar unos minutos..."</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index d33a77d..7a9ce14 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nunca si se está cargando la batería"</item>
     <item msgid="6592896328877671197">"Nunca (utiliza más batería)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Cuando la pantalla se apague"</item>
+    <item msgid="8137861573803398334">"Nunca durante la carga de la batería"</item>
+    <item msgid="5996547094658157629">"Nunca (utiliza más batería)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automático"</item>
     <item msgid="6670588712989942178">"Solo 5 GHz"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3a306cb..824aae8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Informarme cuando haya una red abierta disponible"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desconexión de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especificar cuándo cambiar de Wi-Fi a datos móviles"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especificar cuándo desconectarse de una red Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Error al cambiar la configuración"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Añadir red Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Red"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Dirección MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tiempo de actividad"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Usar redes inalámbricas"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Para ver una ubicación en aplicaciones (por ejemplo, Google Maps)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicación determinada por redes móviles o Wi-Fi"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Ubicación precisa a nivel de calle"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index d1bea2f..4db81fd 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"هرگز در هنگام اتصال"</item>
     <item msgid="6592896328877671197">"هیچوقت (از میزان بیشتری انرژی باتری استفاده می کند)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"هنگامی که صفحه خاموش می شود"</item>
+    <item msgid="8137861573803398334">"هنگام اتصال هرگز"</item>
+    <item msgid="5996547094658157629">"هیچوقت (از میزان بیشتری نیروی باتری استفاده می کند)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"خودکار"</item>
     <item msgid="6670588712989942178">"فقط 5 گیگاهرتز"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 826b460..62996aa 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"هنگام در دسترس بودن یک شبکه باز، به من اعلام شود"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"خط مشی قطع اتصال Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"زمان جابجایی Wi-Fi به داده تلفن همراه را مشخص کنید"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"تعیین زمان قطع اتصال از Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"هنگام تغییر تنظیمات مشکلی رخ داد"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"افزودن شبکه Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"شبکه های Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"شبکه"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"آدرس Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"آدرس بلوتوث"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"شماره سریال"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"در دسترس نیست"</string>
     <string name="status_up_time" msgid="7294859476816760399">"زمان فعالیت"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"زمان بیداری"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"استفاده از شبکه های بی سیم"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"با استفاده از شبکه های بی سیم، مکان را در برنامه ها (از قبیل Maps) مشاهده کنید."</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"مکان تعیین شده توسط شبکه های Wi-Fi یا شبکه های تلفن همراه"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"استفاده از ماهواره های GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"هنگام موقعیت یابی، دقت تا سطح خیابان"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"پیدا کردن سطح خیابان (به میزان بیشتری باتری و نمایی از آسمان نیاز است)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"برنامه ها در هر زمان می توانند داده ها را همگام کرده، ارسال و دریافت کنند"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"توجه"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"غیرفعال کردن داده های پس زمینه طول عمر باتری را بیشتر کرده و مصرف داده ها را کاهش می دهد. برخی از برنامه ها ممکن است همچنان از اتصال داده در پس زمینه استفاده کنند."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"همگام سازی خودکار"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"همگام سازی خودکار"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"همگام سازی خودکار داده ها توسط برنامه ها"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"مدیریت حساب ها"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"همگام سازی روشن است"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"خطای همگام سازی"</string>
     <string name="settings_backup" msgid="2274732978260797031">"تهیه پشتیبان از تنظیمات"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"تهیه نسخه پشتیبان از تنظیمات من"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"همگام سازی اکنون"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"لغو همگام سازی"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"هم اکنون همگام سازی کنید"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"لغو همگام سازی"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"لمس کنید تا اکنون همگام سازی شود<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"تقویم"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"مخاطبین"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"تقویم"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"مخاطبین"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"به همگام ساز Google خوش آمدید!"</font>" "\n"این رویکردی از Google است برای همگام سازی داده ها و ایجاد امکان دسترسی به مخاطبین، قرارها و موارد بیشتر از هر کجا که هستید."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"تنظیمات همگام سازی برنامه کاربردی"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"داده و همگام سازی"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 07cdb7b..29cc80a 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Ei koskaan, kun laturi on kytketty"</item>
     <item msgid="6592896328877671197">"Ei koskaan (käyttää enemmän akkua)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kun näyttö sammuu"</item>
+    <item msgid="8137861573803398334">"Ei koskaan, kun laturi on kytketty"</item>
+    <item msgid="5996547094658157629">"Ei koskaan (käyttää enemmän akkua)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automaattinen"</item>
     <item msgid="6670588712989942178">"Vain 5 GHz"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4195f86..838f4d3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Ilmoita, kun avoin verkko on käytettävissä"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wifi-yhteyden katkaisukäytäntö"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Määritä, milloin vaihdetaan wifi-yhteydestä mobiiliverkkoyhteyteen"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Määritä, milloin wifi-yhteys katkaistaan"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Asetuksen vaihtaminen epäonnistui"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Lisää wifi-verkko"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wifi-verkot"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Verkko"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wifi-yhteyden MAC-osoite"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-osoite"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Sarjanumero"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ei käytettävissä"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Käynnissäoloaika"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Käytössäoloaika"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Käytä langattomia verkkoja"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Näytä sijainti sovelluksissa (kuten Mapsissa) langattomien verkkojen avulla"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Sijainti määritetään wifi:n ja/tai mobiiliverkkojen avulla"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Sijainti määritetty wifi-yhteyden perusteella"</string>
     <string name="location_gps" msgid="6296125378829097831">"Käytä GPS-satelliitteja"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Tarkenna katutasolle, kun määritetään sijaintia"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Lähennä katutasoon (kuluttaa enemmän akkua sekä taivasnäkymän)"</string>
@@ -1385,7 +1384,7 @@
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenteri"</string>
-    <string name="sync_contacts" msgid="9174914394377828043">"Yhteyshenkilöt"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Yhteystiedot"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Tervetuloa käyttämään Google Sync -palvelua!"</font>" "\n"Se on Googlen tapa synkronoida tietoja, ja sen avulla voit käyttää yhteystietojasi, tapaamisiasi ynnä muuta mistä tahansa."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Sovelluksen synkronointiasetukset"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Tiedot ja synkronointi"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 8170665..2cb86e6 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Jamais si branché"</item>
     <item msgid="6592896328877671197">"Jamais (utilise davantage de batterie)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Lorsque l\'écran s\'éteint"</item>
+    <item msgid="8137861573803398334">"Jamais lorsque appareil branché"</item>
+    <item msgid="5996547094658157629">"Jamais (utilise plus de batterie)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatique"</item>
     <item msgid="6670588712989942178">"5 GHz uniquement"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f136ff9..cc8b392 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -46,7 +46,7 @@
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID ou IDC"</string>
     <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Désinstaller mémoire USB"</string>
-    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Retirer la carte SD"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Désinstaller la carte SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Effacer la mémoire de stockage USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Effacer la carte SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Petite"</string>
@@ -124,8 +124,8 @@
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activation du Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Connexion automatique"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Paramètres d\'heure et de date"</string>
-    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00 h"</string>
-    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13 h 00"</string>
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Choisir fuseau horaire"</string>
     <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Aperçu :"</string>
@@ -195,16 +195,16 @@
     <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Aucune carte SD n\'a été trouvée."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Octets disponibles :"</string>
     <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Mémoire USB utilisée comme stockage de masse"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La carte SD est utilisée comme périphérique de stockage."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La carte SD est utilisée comme périphérique de stockage de masse."</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Retirez la mémoire USB en toute sécurité."</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Vous pouvez maintenant retirer la carte SD en toute sécurité."</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Mémoire USB retirée en cours d\'utilisation"</string>
-    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La carte SD a été retirée pendant son utilisation !"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Mémoire USB retirée pendant son utilisation"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La carte SD a été retirée pendant son utilisation !"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Octets utilisés :"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Recherche de médias sur USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Recherche fichiers multimédias sur USB"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Recherche de fichiers multimédias sur la carte SD…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Mémoire de stockage USB en lecture seule"</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Carte SD montée en lecture seule"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Carte SD installée en lecture seule"</string>
     <string name="skip_label" msgid="47510779345218297">"Ignorer"</string>
     <string name="next_label" msgid="4693520878012668114">"Suivant"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Langue"</string>
@@ -278,7 +278,7 @@
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Crypter le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Veuillez charger votre batterie, puis réessayer."</string>
     <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"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 l\'écran de verrouillage"</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 cryptage."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Valider le cryptage"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Crypter la tablette ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le cryptage peut prendre une heure au minimum, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
@@ -294,7 +294,7 @@
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Le cryptage a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre tablette. Vous pouvez essayer de crypter à nouveau votre tablette, une fois la réinitialisation terminée."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Le cryptage a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre téléphone. Vous pouvez essayer de crypter à nouveau votre téléphone, une fois la réinitialisation terminée."</string>
     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurer verr. écran"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurer verrouillage"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurer verr. écran"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Modifier le verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modifier ou désactiver la sécurité : schéma, code PIN ou mot de passe"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choisir une méthode pour verrouiller l\'écran"</string>
@@ -328,7 +328,7 @@
     <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Le code PIN ne doit pas contenir plus de %d chiffres."</string>
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Le code PIN ne doit pas contenir plus de %d chiffres."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Le code PIN ne doit contenir que des chiffres compris entre 0 et 9."</string>
-    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Code PIN récent refusé par admin. périphérique"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Code PIN récent refusé par l\'administrateur de l\'appareil"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Le mot de passe contient un caractère non autorisé."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Le mot de passe doit comporter au moins une lettre."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Le mot de passe doit comporter au moins un chiffre."</string>
@@ -357,14 +357,14 @@
     <item quantity="one" msgid="1716355580615489062">"Le mot de passe doit comporter au moins 1 caractère ne correspondant pas à une lettre."</item>
     <item quantity="other" msgid="5574191164708145973">"Le mot de passe doit comporter au moins %d caractères ne correspondant pas à des lettres."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Mot de passe récent refusé par admin. périphérique"</string>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Mot de passe récent refusé par l\'administrateur de l\'appareil"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuler"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Suivant"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administration du périphérique"</string>
-    <string name="manage_device_admin" msgid="5059296715271077278">"Administrateurs du périphérique"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afficher ou désactiver les administrateurs du périphérique"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administrateurs de l\'appareil"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afficher ou désactiver les administrateurs de l\'appareil"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activer le Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Paramètres Bluetooth"</string>
@@ -387,7 +387,7 @@
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Un problème est survenu lors de la connexion à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Rechercher des appareils"</string>
     <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Trouver des appareils à proximité"</string>
-    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Paramètres du périphérique"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Paramètres de l\'appareil"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Périphériques associés"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Périphériques trouvés"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Se connecter"</string>
@@ -407,12 +407,12 @@
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté du périphérique d\'entrée."</string>
     <string name="bluetooth_disconnect_pan_profile" msgid="877883150720888525">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté du partage de connexion."</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Options de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Commandes du périphérique"</string>
+    <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Commandes de l\'appareil"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Se connecter"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connecter à un appareil Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profils"</string>
-    <string name="bluetooth_device_advanced_rename_device" msgid="350508394033808532">"Renommer le périphérique"</string>
-    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Autoriser le transfert en entrée"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="350508394033808532">"Renommer de l\'appareil"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Autoriser les fichiers entrants"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté aux paramètres audio du téléphone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Me notifier lorsqu\'un réseau ouvert est disponible"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Règles de déconnexion du Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Indiquer quand basculer du Wi-Fi sur le réseau de données mobile"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Indiquer quand déconnecter du Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Un problème est survenu lors de la modification des paramètres."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Ajouter un réseau Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Réseaux Wi-Fi"</string>
@@ -527,9 +528,9 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Autoriser la vibration en mode silencieux"</string>
+    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Autoriser le vibreur en mode silencieux"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibreur"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibrations pour les appels et les notifications"</string>
+    <string name="vibrate_summary" msgid="7378130397830790458">"Vibreur pour les appels et les notifications"</string>
     <string name="notification_sound_title" msgid="6316316069880531693">"Sonnerie de notification"</string>
     <string name="notification_sound_summary" msgid="2953599929394109819"></string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
@@ -562,7 +563,7 @@
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Paramètres station d\'accueil bureau associée"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Paramètres support voiture associé"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablette non insérée dans la station d\'accueil"</string>
-    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Le téléphone n\'est pas sur sa base."</string>
+    <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="7935403744079168804">"Pour configurer les paramètres audio de la station d\'accueil, vous devez insérer la tablette dans cette dernière."</string>
@@ -582,26 +583,26 @@
     <string name="animations_summary_off" msgid="2777026828025551983">"Animation lors de l\'ouverture et de la fermeture des fenêtres"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotation auto écran"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Changer automatiquement d\'orientation lors de la rotation"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
     <string name="brightness" msgid="2354961343555249270">"Luminosité"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Délai"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"L\'écran s\'éteint automatiquement au bout de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de blocage carte SIM"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurer blocage SIM"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocage de la carte SIM"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquer la carte SIM"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage de la SIM"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurer verrouillage carte SIM"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"Verrouillage de la SIM"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Verrouiller la carte SIM"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Demander le code PIN pour utiliser la tablette"</string>
     <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 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">"Bloquer la carte SIM"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Débloquer 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>
     <string name="sim_enter_old" msgid="6074196344494634348">"Ancien code PIN de la carte SIM"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Nouveau code PIN de la carte SIM"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Confirmez le nouveau code PIN"</string>
@@ -610,7 +611,7 @@
     <string name="sim_pins_dont_match" msgid="4664611595579163214">"Les codes PIN ne correspondent pas !"</string>
     <string name="sim_change_failed" msgid="4823538458798362222">"Impossible de modifier le code PIN."\n"Il se peut que ce code PIN soit incorrect."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Le code PIN de la carte SIM a été modifié."</string>
-    <string name="sim_lock_failed" msgid="6676748290838006404">"Impossible de changer l\'état de blocage de la carte SIM."\n"Il se peut que le code PIN soit incorrect."</string>
+    <string name="sim_lock_failed" msgid="6676748290838006404">"Impossible de changer l\'état de verrouillage de la carte SIM."\n"Il se peut que le code PIN soit incorrect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuler"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"État de la tablette"</string>
@@ -630,7 +631,7 @@
     <string name="storage_settings" msgid="4211799979832404953">"Stockage"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Paramètres de stockage"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Désinstaller la mémoire de stockage USB, afficher l\'espace disponible"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Retirer la carte SD, afficher la mémoire disponible"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Désinstaller la carte SD, afficher la mémoire disponible"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mon numéro de téléphone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Réseau"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresse MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresse Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Numéro de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Non disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durée d\'activité"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps en activité"</string>
@@ -657,16 +657,16 @@
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Applications"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Support"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Démonter stockage partagé"</string>
-    <string name="sd_eject" product="default" msgid="6915293408836853020">"Désactiver la carte SD"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Désinstal. mémoire partagée"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Désinstaller la carte SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Désinstaller mémoire USB interne"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Désinstaller la carte SD pour la retirer en toute sécurité"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insérer mémoire USB à installer"</string>
-    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insérer la carte SD à monter"</string>
-    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Connecter une mémoire de stockage USB"</string>
-    <string name="sd_mount" product="default" msgid="5940523765187704135">"Monter la carte SD"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insérer la carte SD à installer"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Installer une mémoire de stockage USB"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Installer la carte SD"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Installer la mémoire de stockage USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Monter la carte SD"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Installer la carte SD"</string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Effacer la mémoire USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Effacer la carte SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Effacer les données de la mémoire de stockage USB interne (ex. : musique, photos)"</string>
@@ -674,17 +674,17 @@
     <string name="sd_unavailable" msgid="8580107589533213904">"Non disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Lecture seule)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Désinstaller la mémoire de stockage USB"</string>
-    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Désactiver la carte SD"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si vous désactivez la mémoire de stockage USB, certaines applications en cours d\'utilisation seront fermées. Elles risquent de rester indisponibles jusqu\'à ce que la mémoire de stockage USB soit réactivée."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si vous désactivez la carte SD, certaines applications que vous utilisez s\'arrêteront et risquent de ne plus être disponibles tant que vous n\'aurez pas réactivé la carte SD."</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Désinstaller la carte SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si vous désinstallez la mémoire de stockage USB, certaines applications en cours d\'utilisation seront fermées. Elles risquent de rester indisponibles jusqu\'à ce que la mémoire de stockage USB soit réinstallée."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si vous désinstallez la carte SD, certaines applications que vous utilisez s\'arrêteront et risquent de ne plus être disponibles tant que vous n\'aurez pas réinstallé la carte SD."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Impossible de désinstaller USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Échec de la désactivation de la carte SD"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Échec de la désinstallation de la carte SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Impossible de désinstaller la mémoire de stockage USB. Réessayez ultérieurement."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Impossible de désactiver la carte SD. Réessayez ultérieurement."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Impossible de désinstaller la carte SD. Réessayez ultérieurement."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"La mémoire de stockage USB va être désinstallée."</string>
-    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La carte SD va être démontée."</string>
-    <string name="sd_ejecting_title" msgid="8824572198034365468">"Désactivation en cours"</string>
-    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désactivation en cours"</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La carte SD va être désinstallée."</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Désinstallation en cours"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désinstallation en cours"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -754,14 +754,14 @@
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Tout effacer"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Créez 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 créer votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</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="call_settings_title" msgid="5188713413939232801">"Paramètres d\'appel"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"Configurer mess. vocale, transferts d\'appel, mises en attente, numéro de l\'appelant"</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>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Point d\'accès Wi-Fi mobile"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Partage connexion Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Partage connexion/point accès mobile"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Partage de connexion"</string>
     <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Partager la connexion de données de la tablette via un câble USB"</string>
     <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Partager la connexion de données de votre mobile via un câble USB"</string>
     <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Transformer sa connexion de données en point d\'accès Wi-Fi mobile"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Utiliser réseaux sans fil"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Afficher ma position dans les applications (comme Google Maps)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Position géographique déterminée par réseaux Wi-Fi et/ou mobile"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Position déterminée par le Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utiliser satellites GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Lors de la géolocalisation, localisation à la rue près"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localiser au niveau rue (requiert + de batterie et une vue dégagée)"</string>
@@ -832,7 +831,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmer votre code PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Les codes PIN ne correspondent pas."</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Sélection méthode déverrouillage"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Méthode de déverrouillage"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Le code PIN a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
@@ -951,7 +950,7 @@
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Déplacer l\'application"</string>
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Échec du déplacement de l\'application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Emplacement d\'installation souhaité"</string>
-    <string name="app_install_location_summary" msgid="879753854530300436">"Modifiez l\'emplacement d\'installation par défaut pour les nouvelles applications."</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Modifier l\'emplacement d\'installation par défaut pour les nouvelles applications"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisation du stockage"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Afficher l\'espace de stockage utilisé par les applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
@@ -962,8 +961,8 @@
     <string name="service_started_by_app" msgid="6575184738671598131">"Service démarré par l\'application"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> libre"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilisés"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> libre(s)"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilisé(s)"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
@@ -981,7 +980,7 @@
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Impossible d\'arrêter correctement cette application. Si vous continuez, vous risquez de perdre une partie des travaux en cours."</string>
     <string name="background_process_stop_description" msgid="1728354083304746737">"Processus d\'une ancienne application conservé pour permettre une vitesse accrue si besoin. Il ne doit généralement pas être arrêté."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"En cours d\'utilisation : <xliff:g id="CLIENT_NAME">%1$s</xliff:g>. Appuyez sur Paramètres pour contrôler ce client."</string>
-    <string name="main_running_process_description" msgid="929204645380391397">"Principal processus actuellement utilisé"</string>
+    <string name="main_running_process_description" msgid="929204645380391397">"Processus principal actuellement utilisé"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Le service <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"L\'opérateur <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Arrêter le service système ?"</string>
@@ -1040,7 +1039,7 @@
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Utiliser la langue du système"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Paramètres <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Sélectionner modes de saisie actifs"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Paramètres du clavier intégré"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Paramètres du clavier virtuel"</string>
     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Clavier intégré"</string>
     <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Paramètres du clavier physique intégré"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Développement"</string>
@@ -1100,7 +1099,7 @@
     <skip />
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi/temps"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi à temps"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi/temps"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Informations sur l\'historique"</string>
     <string name="details_title" msgid="3792801565213935385">"Informations sur l\'utilisation"</string>
@@ -1141,13 +1140,13 @@
     <string name="battery_desc_display" msgid="5432795282958076557">"Batterie utilisée par l\'affichage et le rétro-éclairage"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Réduire la luminosité et/ou le délai de mise en veille de l\'écran"</string>
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Batterie utilisée par le Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Désactivez le Wi-Fi lorsque vous ne l\'utilisez pas ou lorsqu\'il n\'est pas disponible"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Désactiver le Wi-Fi lorsque vous ne l\'utilisez pas ou lorsqu\'il n\'est pas disponible"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Batterie utilisée par Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Désactivez Bluetooth lorsque vous ne l\'utilisez pas."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Essayez de vous connecter à un autre appareil Bluetooth"</string>
     <string name="battery_desc_apps" msgid="6665712811746233450">"Batterie utilisée par l\'application"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Arrêter ou désinstaller l\'application"</string>
-    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Contrôlez manuellement le GPS pour éviter que l\'application ne l\'utilise."</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Contrôler manuellement le GPS pour éviter que l\'application ne l\'utilise"</string>
     <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
@@ -1176,7 +1175,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affecte le ton utilisé par la synthèse vocale"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Langue"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définir la langue utilisée par la synthèse vocal"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définir la langue utilisée par la synthèse vocale"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Écouter un échantillon"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Lire une courte démonstration de la synthèse vocale"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"Installer les données vocales"</string>
@@ -1320,21 +1319,21 @@
     <string name="auto_restore_summary" msgid="83177150536734378">"Restaurer les paramètres ou autres données sauvegardées lorsqu\'une application est réinstallée"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sauvegarder"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Voulez-vous vraiment arrêter de sauvegarder vos mots de passe Wi-Fi, vos favoris ainsi que vos données et paramètres d\'application, et supprimer les copies correspondantes des serveurs Google ?"</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres d\'administration du périphérique"</string>
-    <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrateur du périphérique"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres d\'administration de l\'appareil"</string>
+    <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrateur de l\'appareil"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Désactiver"</string>
-    <string name="select_device_admin_msg" msgid="2645509057946368094">"Administrateurs du périphérique"</string>
-    <string name="no_device_admins" msgid="702695100241728775">"Aucun administrateur de périphérique disponible"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Activer l\'administrateur du périphérique ?"</string>
+    <string name="select_device_admin_msg" msgid="2645509057946368094">"Administrateurs de l\'appareil"</string>
+    <string name="no_device_admins" msgid="702695100241728775">"Aucun administrateur disponible."</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Activer l\'administrateur de l\'appareil ?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Activer"</string>
-    <string name="device_admin_add_title" msgid="7705551449705676363">"Administrateur du périphérique"</string>
+    <string name="device_admin_add_title" msgid="7705551449705676363">"Administrateur de l\'appareil"</string>
     <string name="device_admin_warning" msgid="1149471041373876923">"L\'activation de cet administrateur permettra à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
     <string name="device_admin_status" msgid="7169948053970923035">"Cet administrateur est activé et permet à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sans nom"</string>
-    <string name="sound_category_sound_title" msgid="1488759370067953996">"Généralités"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"Paramètres généraux"</string>
     <string name="sound_category_calls_title" msgid="3688531959256239012">"Appels entrants"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifications"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Commentaires"</string>
+    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Retour sonore"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"Configuration Wi-Fi"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Se connecter au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Connexion au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1355,7 +1354,7 @@
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Appuyez sur un réseau pour vous y connecter"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Se connecter à un réseau existant"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Connexion à un réseau non sécurisé"</string>
-    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Définissez la configuration du réseau"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Définir la configuration du réseau"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Se connecter à un nouveau réseau"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connexion en cours…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Passer à l\'étape suivante"</string>
@@ -1395,8 +1394,8 @@
     <string name="header_add_an_account" msgid="756108499532023798">"Ajouter un compte"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Terminer"</string>
     <string name="really_remove_account_title" msgid="6574643117748564960">"Supprimer le compte"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Voulez-vous vraiment supprimer ce compte ? Les éléments suivants seront également supprimés du téléphone : messages, contacts et autres données."\n"Voulez-vous continuer ?"</string>
-    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Voulez-vous vraiment supprimer ce compte? Les éléments suivants seront également supprimés du téléphone : messages, contacts et autres données. "\n"Voulez-vous continuer?"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Voulez-vous vraiment supprimer ce compte ? Les éléments suivants seront également supprimés de la tablette : messages, contacts et autres données."\n"Voulez-vous continuer ?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Voulez-vous vraiment supprimer ce compte ? Les éléments suivants seront également supprimés du téléphone : messages, contacts et autres données. "\n"Voulez-vous continuer?"</string>
     <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Des applications utilisent ce compte. Pour le supprimer, vous devez restaurer les valeurs par défaut de la tablette sous Paramètres &gt; Confidentialité, ce qui a pour effet d\'effacer toutes vos données personnelles."</string>
     <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Des applications utilisent ce compte. Pour le supprimer, vous devez restaurer les valeurs par défaut du téléphone (cela efface toutes vos données personnelles) via l\'application Paramètres, sous Confidentialité."</string>
     <string name="provider_label" msgid="7724593781904508866">"Abonnements Push"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index d2a8900..c513415 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nikad ako je priključeno"</item>
     <item msgid="6592896328877671197">"Nikada (veća potrošnja baterije)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kad se zaslon isključi"</item>
+    <item msgid="8137861573803398334">"Nikad ako je priključeno"</item>
+    <item msgid="5996547094658157629">"Nikad (troši više baterije)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatski"</item>
     <item msgid="6670588712989942178">"Samo 5 GHz"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 95f3a0d..11fb4e8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -201,7 +201,7 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB memorija uklonjena je dok se upotrebljavala!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD kartica je uklonjena tijekom upotrebe!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Iskorišteni bajtovi:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB poh. za medije…"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB mem. za medije…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Pretraživanje medija na SD kartici skeniranjem…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB poh. uklj. samo za čitanje"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD kartica priključena je u načinu samo za čitanje"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Obavijesti me ako postoji otvorena mreža"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Pravila isključivanja za Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Navedite trenutak za prebacivanje sa značajke Wi-Fi na mobilne podatke"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Odredite kada uređaj treba isključiti s Wi-Fi mreže"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem s promjenom postavke"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Dodaj Wi-Fi mrežu"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi mreže"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Mreža"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC adresa"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nije dostupno"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Vrijeme aktivnosti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vrijeme bez mirovanja"</string>
@@ -661,7 +661,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Isključi unutarnju USB memoriju"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Isključite karticu SD radi sigurnog uklanjanja"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Umetni mem. USB za uklj."</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Umetni USB mem. za uklj."</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Umetnite SD karticu za uključivanje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Uključi memoriju USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Uključivanje SD kartice"</string>
@@ -677,7 +677,7 @@
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Isključi SD karticu"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ako isključite memoriju USB, neke će se aplikacije koje upotrebljavate zaustaviti i mogu biti nedostupne dok ponovno ne uključite memoriju USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ako isključite SD karticu, dio aplikacija koje koristite zaustavit će rad i možda će biti nedostupne sve dok ponovno ne uključite SD karticu."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Isključ. memorije USB neuspjelo"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Neusp. isključ. USB memorije"</string>
     <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Isključivanje SD kartice nije uspjelo"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Memorija USB ne može se isključiti. Pokušajte ponovno kasnije."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nije moguće isključiti SD karticu. Pokušajte ponovno."</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Koristiti bežične mreže"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Pogledajte lokaciju u aplikacijama (primjerice Karte) pomoću bežične veze"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokacija je utvrđena značajkom Wi-Fi i/ili mobilnim mrežama"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokacija utvrđena pomoću Wi-Fi točke"</string>
     <string name="location_gps" msgid="6296125378829097831">"Koristi GPS satelite"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Kod lociranja, točnost je na razini ulice"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Lociranje do razine ulice (troši više baterije i treba imati pogled na nebo)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Aplikacije mogu sink., slati i primati podatke bilo kada"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Pažnja"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Onemogućavanje pozadinskih podataka produljuje trajanje baterije i smanjuje upotrebu podataka. Neke aplikacije još uvijek mogu upotrebljavati pozadinsku podatkovnu mrežu."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automatska sinkronizacija"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatska sinkronizacija"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikacije podatke sinkroniziraju automatski"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Upravljaj računima"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sink. uključena"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Pogreška sink."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Postavke sigurnosne kopije"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Stvori sigurnosnu kopiju postavki"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkroniziraj sada"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Otkaži sinkronizaciju"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkroniziraj sada"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Otkaži sinkronizaciju"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Dodirnite da biste odmah sinkronizirali<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendar"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontakti"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Kalendar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontakti"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Dobro došli u Google sinkronizaciju!"</font>" "\n"Googleov pristup sinkronizaciji podataka za mogućnost pristupa kontaktima, sastancima i drugim stavkama s bilo kojeg mjesta."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Postavke sinkronizacije aplikacije"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podaci i sinkronizacija"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 5f2c8ea..7bbfefe 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Soha, ha töltőn van"</item>
     <item msgid="6592896328877671197">"Soha (több akkumulátortöltést használ)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Amikor a képernyő kikapcsol"</item>
+    <item msgid="8137861573803398334">"Soha, ha töltőn van"</item>
+    <item msgid="5996547094658157629">"Soha (több akkutöltést használ)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatikus"</item>
     <item msgid="6670588712989942178">"Csak 5 GHz"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8f8ab4c..b268da3 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Értesítést kérek az elérhető nyitott hálózatokról"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi leválasztási irányelv"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Adja meg, mikor legyen váltás Wi-Fi-ről mobil adatokra"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Adja meg, mikor kapcsolódjon le a Wi-Firől"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Probléma adódott a beállítás megváltoztatásakor"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fi hálózat hozzáadása"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi hálózatok"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Hálózat"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi eszköz MAC-címe"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-cím"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Sorozatszám"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nem érhető el"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Futásidő"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Készenléti idő"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Vezeték nélküli hálózatok használata"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Hely megjelenítése az alkalmazásokban (például Google Térkép) vezeték nélküli hálózatok használatakor"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"A tartózkodási helyet a rendszer a Wi-Fi- és/vagy a mobilhálózatok alapján állapítja meg"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Helymeghatározás Wi-Fi-vel"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS műholdak használata"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Helymeghatározáskor utcaszintű pontosság"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Utcaszintű helymeghatározás (több energiát igényel, és csak nyílt terepen lehetséges)"</string>
@@ -1380,12 +1379,12 @@
     <string name="settings_backup" msgid="2274732978260797031">"Biztonsági mentés beállításai"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Biztonsági másolat készítése a beállításaimról"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Szinkronizálás most"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Szinkronizálás felfüggesztése"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Szinkronizálás megszakítása"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Érintse meg az azonnali szinkronizáláshoz<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Naptár"</string>
-    <string name="sync_contacts" msgid="9174914394377828043">"Partnerek"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Névjegyek"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Üdvözli a Google Sync!"</font>" "\n"Az adatok Google-féle szinkronizálása lehetővé teszi, hogy bárhonnan hozzáférjen címtárához, találkozóihoz stb."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Alkalmazásszinkronizálási beállítások"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Adatok és szinkronizálás"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 6009297..d6be56e 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Tidak pernah ketika tersambung"</item>
     <item msgid="6592896328877671197">"Tidak pernah (menggunakan lebih banyak daya baterai)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Ketika layar mati"</item>
+    <item msgid="8137861573803398334">"Tidak pernah ketika tersambung"</item>
+    <item msgid="5996547094658157629">"Tidak pernah (lebih menguras daya)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Otomatis"</item>
     <item msgid="6670588712989942178">"Hanya 5 GHz"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 655e5b8..ced6bb5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Beri tahu saya ketika ada jaringan yang tersedia"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Kebijakan pemutusan sambungan Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Tentukan saat beralih dari Wi-Fi ke data seluler"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Tentukan saat untuk memutus sambungan Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ada masalah saat mengubah setelan"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Tambahkan jaringan Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Jaringan Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Jaringan"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Alamat MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Alamat bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Nomor seri"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Tidak Tersedia"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Waktu aktif"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Waktu bangun"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Gunakan jaringan nirkabel"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Lihat lokasi pada aplikasi (seperti Maps) menggunakan jaringan nirkabel"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokasi yang ditentukan oleh jaringan Wi-Fi dan/atau seluler"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokasi yang dipastikan oleh Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Gunakan satelit GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Saat mencari, akurasi hingga level jalan"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Lokal ke tingkat jalan (membutuhkan lebih banyak baterai plus kondisi cuaca)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Aplikasi dapat menyinkronkan, mengirimkan, dan menerima data kapan pun"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Perhatian"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Menonaktifkan data latar belakang memperpanjang masa pakai baterai dan menurunkan penggunaan data. Beberapa aplikasi masih dapat menggunakan sambungan data latar belakang."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Sinkronisasi otomatis"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sinkronisasi otomatis"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikasi menyinkronkan data secara otomatis"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Mengelola akun"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinkronisasi AKTIF"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Galat sinkronisasi"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Setelan cadangan"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Cadangkan setelan saya"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkronisasi sekarang"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Batalkan sinkronisasi"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkronkan sekarang"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Batalkan sinkronisasi"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Sentuh untuk menyinkronkan sekarang<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kenalan"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kenalan"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>\n" Pendekatan Google untuk menyinkronkan data guna membolehkan akses ke kenalan, janji temu, dan lain-lain dari mana saja."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Setelan sinkronisasi aplikasi"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; sinkronisasi"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 3811bd2..5da0a676 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Mai quando collegato"</item>
     <item msgid="6592896328877671197">"Mai (consuma più batteria)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Quando lo schermo si disattiva"</item>
+    <item msgid="8137861573803398334">"Mai quando collegato"</item>
+    <item msgid="5996547094658157629">"Mai (consuma più batteria)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatica"</item>
     <item msgid="6670588712989942178">"Solo 5 GHz"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 643847b..6aa8e81 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Avvisa quando è disponibile una rete aperta"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Norma di scollegamento Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Specifica quando passare da Wi-Fi a dati cellulare"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Specifica quando eseguire la disconnessione dalla rete Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Si è verificato un problema durante la modifica dell\'impostazione"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Aggiungi rete Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Reti Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Rete"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Indirizzo MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Indirizzo Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Numero di serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Non disponibile"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo di attività"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo di attività"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Usa reti wireless"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Visualizza la posizione nelle applicazioni (ad esempio Maps) utilizzando le reti wireless"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Posizione determinata dalle reti mobili e/o Wi-Fi"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Posizione determinata da Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utilizza satelliti GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Nel rilevamento della posizione, precisione a livello stradale"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizza a livello stradale (richiede più batteria e la vista del cielo)"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index af276b5..6402d99 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -41,7 +41,7 @@
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 שניות"</item>
-    <item msgid="8881760709354815449">"שניות"</item>
+    <item msgid="8881760709354815449">"30 שניות"</item>
     <item msgid="7589406073232279088">"דקה אחת"</item>
     <item msgid="7001195990902244174">"2 דקות"</item>
     <item msgid="7489864775127957179">"5 דקות"</item>
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"לעולם לא כאשר מחובר"</item>
     <item msgid="6592896328877671197">"לעולם לא (שימוש ביותר צריכת סוללה)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"כאשר המסך נכבה"</item>
+    <item msgid="8137861573803398334">"לעולם לא כאשר מחובר"</item>
+    <item msgid="5996547094658157629">"לעולם לא (משתמש בצריכת סוללה רבה יותר)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"רכב"</item>
     <item msgid="6670588712989942178">"‎5 GHz בלבד"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 7af1503..ab0a5c6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"הודע לי כשיש רשת פתוחה זמינה"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"מדיניות ניתוק Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"ציין מתי לעבור מ-Wi-Fi לנתונים להתקנים ניידים"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"ציין מתי להתנתק מה-Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"אירעה בעיה בשינוי ההגדרה"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"הוסף רשת Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"רשתות Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"רשת"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"כתובת ה-MAC של Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"כתובת Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"מספר סידורי"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"לא זמין"</string>
     <string name="status_up_time" msgid="7294859476816760399">"זמן פעולה"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"זמן התעוררות"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"השתמש ברשתות אלחוטיות"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"ראה מיקום ביישומים (כגון \'מפות Google\') באמצעות רשתות אלחוטיות"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"המיקום נקבע באמצעות Wi-Fi ו/או רשתות סלולריות"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"המיקום נקבע על ידי Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"השתמש בלווייני GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"בעת איתור, דייק עד לרמת הרחוב"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"אתר לרמת רחוב (דורש צריכת סוללה נוספת כולל תצוגת שמיים)"</string>
@@ -1379,7 +1378,7 @@
     <string name="sync_error" msgid="5060969083117872149">"שגיאת סנכרון"</string>
     <string name="settings_backup" msgid="2274732978260797031">"הגדרות גיבוי"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"גבה את ההגדרות שלי"</string>
-    <string name="sync_menu_sync_now" msgid="6154608350395805683">"סנכרן כעת"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"סנכרן עכשיו"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"בטל סינכרון"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"גע כדי לסנכרן כעת<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index a5642f4..c606da2 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"電源接続時はスリープにしない"</item>
     <item msgid="6592896328877671197">"切断しない(電池使用量が多くなります)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"画面がOFFになったとき"</item>
+    <item msgid="8137861573803398334">"電源接続時はスリープしない"</item>
+    <item msgid="5996547094658157629">"スリープしない(電池使用量増)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"自動"</item>
     <item msgid="6670588712989942178">"5 GHzのみ"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 22d045f..9f1d8f6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"オープンネットワークが利用可能なときに通知する"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fiの切断ポリシー"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Wi-Fiをスリープに切り替えるタイミング"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Wi-Fiから切断するタイミングを指定する"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"設定の変更中に問題が発生しました"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fiネットワークを追加"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fiネットワーク"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"ネットワーク"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MACアドレス"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetoothアドレス"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"シリアル番号"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"不明"</string>
     <string name="status_up_time" msgid="7294859476816760399">"稼働時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"端末使用時間"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"無線ネットワークを使用"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"地図などのアプリケーションで無線ネットワークの位置情報を使用する"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi/モバイルネットワークで位置を検出する"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fiで検出される現在地"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS機能を使用"</string>
     <string name="location_street_level" msgid="7456259025474443314">"高精度測位を実行する"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"高精度測位を実行する(電池消費量増、屋外で使用する)"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index d2c5648..8c296e7 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"전원에 연결되었을 때는 절전 모드로 전환되지 않음"</item>
     <item msgid="6592896328877671197">"절전 모드로 전환 안함(배터리 전원이 더 많이 소모됨)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"화면이 꺼질 때"</item>
+    <item msgid="8137861573803398334">"전원 연결 시 사용 안함"</item>
+    <item msgid="5996547094658157629">"사용 안함(배터리 소모 큼)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"자동"</item>
     <item msgid="6670588712989942178">"5GHz 전용"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 88f1e55..9b00b5d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -25,7 +25,7 @@
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"발신 허용 번호 보기"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"SDN(Service Dialing Numbers) 보기"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP 목록 가져오기"</string>
-    <string name="radioInfo_service_in" msgid="1915416319177520020">"서비스 상태"</string>
+    <string name="radioInfo_service_in" msgid="1915416319177520020">"서비스 중"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"서비스 지역 벗어남"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"긴급 통화만"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"무선 연결 끊김"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"개방형 네트워크를 사용할 수 있을 때 알림"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi 연결 해제 정책"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Wi-Fi에서 모바일 데이터로 전환될 때 표시"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"언제 Wi-Fi 연결을 중단할지 설정"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"설정을 변경하는 중 문제가 발생했습니다."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fi 네트워크 추가"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 네트워크"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"네트워크"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 주소"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth 주소"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"일련번호"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"사용할 수 없음"</string>
     <string name="status_up_time" msgid="7294859476816760399">"가동 시간"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"무중단 가동 시간"</string>
@@ -795,11 +795,10 @@
     <string name="location_network_based" msgid="8815705866861993344">"무선 네트워크 사용"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"무선 네트워크를 사용하는 애플리케이션(예: 지도)에서 위치 보기"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi 및/또는 모바일 네트워크에서 측정된 위치"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi에서 측정된 위치"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS 위성 사용"</string>
     <string name="location_street_level" msgid="7456259025474443314">"도로 수준으로 정확하게 탐색"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"도로 수준으로 탐색(항공사진이 더해져 배터리 추가로 필요)"</string>
+    <string name="location_gps_disabled" msgid="6632537158777308128">"도로 수준으로 위치 탐색(배터리 소모가 증가되며 실내에서는 정확도가 떨어질 수 있음)"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"GPS 도우미 사용"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"서버를 사용하여 GPS 보조(네트워크 사용량을 줄이려면 선택 취소)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"서버를 사용하여 GPS 보조(GPS 성능을 개선하려면 선택 취소)"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 557f2f7..ffc4585 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Niekada, kai įjungtas į lizdą"</item>
     <item msgid="6592896328877671197">"Niekada (naudojama daugiau baterijos energijos)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kai išsijungia ekranas"</item>
+    <item msgid="8137861573803398334">"Niekada, kai įjungtas į lizdą"</item>
+    <item msgid="5996547094658157629">"Niekada (naudojama daugiau baterijos energijos)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automobiliai"</item>
     <item msgid="6670588712989942178">"Tik 5 GHz"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d7f5382..06b7528 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Pranešti, kai bus galimas atviras tinklas"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"„Wi-Fi“ atjungimo politika"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Nurodyti, kada perjungti iš „Wi-Fi“ į mobilius duomenis"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Nurodykite, kada atjungti nuo „Wi-Fi“"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Keičiant nustatymą kilo problemų"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Pridėti „Wi-Fi“ tinklą"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"„Wi-Fi“ tinklai"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Tinklas"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"„Wi-Fi“ „MAC“ adresas"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"„Bluetooth“ adresas"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serijos numeris"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Užimtas (-a)"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Veikimo laikas"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Veikimo laikas"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Naudoti bevielius tinklus"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Žiūrėti vietas programose (pvz., Žemėlapiuose) naudojant bevielius tinklus"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Vieta nustatyta „Wi-Fi“ ir (arba) mobiliųjų tinklų"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Vietą nustatė „Wi-Fi“"</string>
     <string name="location_gps" msgid="6296125378829097831">"Naudoti GPS palydovus"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Kai nustatoma vieta, pritaikyti gatvės lygiu"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Perkelti į gatvės lygį (reikia daugiau akumuliatoriaus energijos ir dangaus rodinio)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Programos gali bet kada sinchron., siųsti ir gauti duomenis"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Dėmesio"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Neleidžiant foninių duomenų pailgėja akumuliatoriaus naudojimo trukmė ir sumažėja duomenų naudojimas. Kai kurios programos vis tiek gali naudoti foninių duomenų perdavimą."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automatinis sinchronizavimas"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatinis sinchronizavimas"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Programų duomenys sinchronizuojami automatiškai"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Valdyti paskyras"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinchroniz. įjungtas"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Sinchronizav. klaida"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Atsarginės kopijos kūrimo nustatymai"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Kurti atsarginę nustatymų kopiją"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinchronizuoti dabar"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Atšaukti sinchronizavimą"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinchronizuoti dabar"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Atšaukti sinchronizavimą"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Palieskite, kad būtų dabar sinchronizuojama<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendorius"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktai"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Kalendorius"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontaktai"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Sveiki! Tai – „Google“ sinchronizavimas!"</font>" "\n"Tai „Google“ duomenų sinchronizavimo metodas, leidžiantis jums pasiekti kontaktus, susitikimus ir dar daugiau nesvarbu, kur būtumėte."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Programos sinchronizavimo nustatymai"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Duomenys ir sinchronizavimas"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 03a8b73..09cfc8b 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nekad, ja ir pievienots"</item>
     <item msgid="6592896328877671197">"Nekad (izmanto vairāk akumulatora jaudas)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kad ekrāns izslēdzas"</item>
+    <item msgid="8137861573803398334">"Nekad, ja ir pievienots"</item>
+    <item msgid="5996547094658157629">"Nekad (izm. vairāk ak. jaudas)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automātiski"</item>
     <item msgid="6670588712989942178">"Tikai 5 GHz"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5817d88..7fb2460 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Informēt mani, kad ir pieejams atvērts tīkls"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi atvienošanas politika"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Norādīt, kad pārslēgt no Wi-Fi uz mobilajiem datiem"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Norādīt, kad pārtraukt Wi-Fi savienojumu"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Mainot iestatījumu, radās kļūda"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Pievienot Wi-Fi tīklu"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi tīkli"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Tīkls"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC adrese"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adrese"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Sērijas numurs"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nepieejams"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Darbības laiks"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Nomoda laiks"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Izmantot bezvadu tīklus"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Skatiet atrašanās vietu lietojumprogrammās (piemēram, Maps), izmantojot bezvadu tīklus"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi un/vai mobilo sakaru tīklu noteiktā atrašanās vieta"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi noteikta atrašanās vieta"</string>
     <string name="location_gps" msgid="6296125378829097831">"Izmantot GPS satelītus"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Meklējot atrašanās vietu, nodrošināt precizitāti līdz adreses līmenim"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Norādīt vietu ielas līmenī (nepieciešams vairāk akumulatora jaudas un skats no augšas)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Lietojumpr. var sinhr., sūtīt un saņemt datus jebkurā brīdī"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Uzmanību!"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Atspējojot fona datus, tiek paildzināts akumulatora darbības mūža ilgums un samazināts datu lietojums. Dažās lietojumprogrammās joprojām var tikt izmantots fona datu savienojums."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automātiska sinhronizācija"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automātiska sinhronizācija"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Lietojumprogrammas automātiski sinhronizē datus"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Kontu pārvaldība"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinhr. ir IESLĒGTA"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Sinhroniz. kļūda"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Dublēšanas iestatījumi"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Iestatījumu dublēšana"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinhronizēt tūlīt"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Atcelt sinhronizāciju"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinhronizēt tūlīt"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Atcelt sinhronizāciju"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Pieskarieties, lai sinhronizētu tūlīt<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendārs"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktpersonas"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Kalendārs"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontaktpersonas"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Laipni lūdzam Google sinhronizācijā!"</font>" "\n"Tā ir Google pieeja datu sinhronizācijai, kas ļauj piekļūt kontaktpersonām, darba uzdevumiem un citiem datiem no jebkuras vietas."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Lietojumprogrammas sinhronizācijas iestatījumi"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dati un sinhronizācija"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 64d989a..a7fa775 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Aldri når tilkoblet"</item>
     <item msgid="6592896328877671197">"Aldri (mer batterikrevende)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Når skjermen slås av"</item>
+    <item msgid="8137861573803398334">"Aldri når tilkoblet strøm"</item>
+    <item msgid="5996547094658157629">"Aldri (mer batterikrevende)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatisk"</item>
     <item msgid="6670588712989942178">"Kun 5 GHz"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 16ad544..addd826 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -198,10 +198,10 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Minnekortet blir brukt som en masselagringsenhet"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-lagring kan nå fjernes"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Det er trygt å fjerne minnekortet"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-lagr. fjernet under bruk!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-enh. fjernet under bruk!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Minnekortet ble fjernet mens det fortsatt var i bruk!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Brukt antall byte:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skanner USB-lagr. for medier"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skanner USB-enh. for medieinnh."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Leter etter media på minnekortet…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-lagr. har kun lesetilg."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Minnekortet ble montert skrivebeskyttet"</string>
@@ -267,13 +267,13 @@
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter nettbrett"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter nettbrettet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter telefon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Numerisk personlig kode eller passord kreves for å dekryptere nettbrettet hver gang du slår den på"</string>
+    <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="2150571569618349332">"Du kan kryptere kontoer, innstillinger, nedlastede programmer med tilhørende data, mediefiler og andre filer. Når du har kryptert nettbrettet, må du angi en numerisk personlig kode eller passord for å dekryptere det hver gang du slår det på. Du kan kun fjerne krypteringen på nettbrettet ved å utføre en tilbakestilling til fabrikkstandard, noe som vil medføre sletting av all data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og beholde nettbrettet tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere kontoer, innstillinger, nedlastede programmer med tilhørende data, mediefiler og andre filer. Når du har kryptert telefonen, må du angi en numerisk personlig kode eller passord for å dekryptere den hver gang du slår den på. Du kan kun fjerne krypteringen på telefonen ved å utføre en tilbakestilling til fabrikkstandard, noe som vil medføre sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med et ladet batteri og beholde telefonen tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptere kontoer, innstillinger, nedlastede applikasjoner med tilhørende data, mediefiler og andre filer. Når du har kryptert nettbrettet, må du angi en personlig tallkode eller passord for å dekryptere det hver gang du slår det på. Du kan kun fjerne krypteringen på nettbrettet ved å utføre en tilbakestilling til fabrikkstandard, noe som vil medføre sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og beholde nettbrettet tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere kontoer, innstillinger, nedlastede applikasjoner 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 kun 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 beholde telefonen tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</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="5920622844033087792">"Lad batteriet, og prøv på nytt."</string>
@@ -281,8 +281,8 @@
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen personlig kode eller passord for å låse skjermen."</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Du må angi personlig kode eller passord for låsing av skjerm før du kan starte kryptering."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekreft kryptering"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vil du kryptere nettbrettet? Handlingen kan ikke angres, og hvis du avbryter den, vil du miste data. Kryptering tar minst én time, og nettbrettet vil starte 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, vil du miste data. Kryptering tar minst én time, og telefonen vil starte på nytt flere ganger underveis."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vil du kryptere nettbrettet? Handlingen kan ikke angres, og hvis du avbryter den, kommer du til å miste data. Kryptering tar minst én time, og nettbrettet starter på nytt flere ganger underveis."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vil du kryptere telefonen? Handlingen kan ikke angres, og hvis du avbryter den, kommer du til å miste data. Kryptering tar minst én time, og telefonen kommer til å starte på nytt flere ganger underveis."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kryptering"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
@@ -293,21 +293,21 @@
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Kryptering mislyktes"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Kryptering ble avbrutt og kan ikke fullføre. Du må utføre en tilbakestilling til fabrikkstandard (sletter all data) før du kan gjenoppta bruken av nettbrettet. Du kan prøve å kryptere nettbrettet på nytt etter at tilbakestillingen er fullført."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Kryptering ble avbrutt og kan ikke fullføre. Du må utføre en tilbakestilling til fabrikkstandard (sletter all data) før du kan gjenoppta bruken av telefonen. Du kan prøve å kryptere telefonen på nytt etter at tilbakestillingen er fullført."</string>
-    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfigurere låseskjermen"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfigurer låseskjermen"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfigurer skjermlåsen"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfigurer skjermlåsen"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Endring av skjermlås"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Endre eller deaktiver mønster, personlig kode eller passordsikkerhet"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Velg en metode for å låse skjermen"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Av"</string>
     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Lås aldri skjermen"</string>
     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Usikker"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Krever ikke mønster, PIN eller passord for å låse opp skjermen"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Ikke krev mønster, PIN eller passord for å låse opp skjermen"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mønster"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Krever mønster for å låse opp skjermen"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Krev mønster for å låse opp skjermen"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Personlig kode"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Krever numerisk PIN-kode for å låse opp skjermen"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Krev personlig tallkode for å låse opp skjermen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passord"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Krever passord for å låse opp skjermen"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Krev passord for å låse opp skjermen"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Deaktivert av ekstern enhetsadministrator"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Av"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Usikker"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Varsle når et åpent nettverk er tilgjengelig"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Retningslinjer for frakoblet Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Spesifiser når telefonen skal bytte fra trådløsnett til mobiltelefonidata"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Angi når du vil koble fra Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Legg til Wi-Fi-nettverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Nettverk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-adresse for WLAN"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ikke tilgjengelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Våken tid"</string>
@@ -655,7 +655,7 @@
     <string name="memory_available" msgid="5052397223077021181">"Tilgjengelig"</string>
     <string name="memory_size" msgid="5458889090691922288">"Totalt"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner …"</string>
-    <string name="memory_apps_usage" msgid="9079237985722858506">"Programmer"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Applikasjoner"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Koble fra delt lagring"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Avmonter/løs ut minnekort"</string>
@@ -723,8 +723,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på nettbrettet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Denne handlingen vil slette alle data fra tavlens"<b>"interne lagringsplass"</b>", inkludert:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og programmer"</li>\n<li>"Nedlastede programmer"</li></string>
-    <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Denne handlingen vil slette alle data fra telefonens"<b>"interne lagringsplass"</b>", inkludert:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og programmer"</li>\n<li>"Nedlastede programmer"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Denne handlingen vil slette alle data fra nettbrettets"<b>"interne lagringsplass"</b>", inkludert:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og applikasjoner"</li>\n<li>"Nedlastede applikasjoner"</li></string>
+    <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Denne handlingen vil slette alle data fra telefonens"<b>"interne lagringsplass"</b>", inkludert:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og applikasjoner"</li>\n<li>"Nedlastede applikasjoner"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"For i tillegg å slette musikk, bilder og andre brukerdata, må "<b>"USB-lagringen"</b>" tømmes."</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Bruk trådløse nettverk"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Se plassering i applikasjoner (som kart) ved hjelp av trådløse nettverk"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Plassering bestemmes ved hjelp av trådløse og/eller mobile nettverk"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Posisjon fastsatt av Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Bruk GPS-satellitter"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Nøyaktig til gatenivå"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Finn plassering på gatenivå (bruker mer batteri, og trenger fri sikt til himmelen)"</string>
@@ -866,7 +865,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="3692151094288835065">"Beskytt nettbrettet mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. Bruk fingeren til koble sammen prikkene i en hvilken som helst rekkefølge på neste skjermbilde. Du må koble sammen minst fire prikker. "\n\n"Klar til å begynne? Berør Neste."</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"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å berøre minst fire prikker. "\n\n"Klar til å begynne? Berør Neste."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Beskytt telefonen fra uautorisert bruk ved å lage et personlig opplåsingsmønster for skjermen. "\n<font height="17">\n</font><b>"1"</b>"  På den neste skjermen, se på mens et eksempelmønster blir tegnet. "\n<font height="17">\n</font><b>"2"</b>"  Når du er klar, tegn ditt eget personlige opplåsingsmønster. Prøv med forskjellige mønster, men tegn over minst fire prikker. "\n<font height="17">\n</font><b>"3"</b>"  Tegn mønsteret på nytt for å bekrefte. "\n<font height="17">\n</font><b>"Klar? Velg «neste»."</b>" "\n<font height="3">\n</font>"For å la telefonen forbli ubeskyttet, velg «Avbryt»."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Installerte applikasjoner"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Hold orden på og fjern installerte applikasjoner"</string>
@@ -874,8 +873,8 @@
     <string name="applications_settings_summary" msgid="2714215108369119717">"Installerte applikasjoner, hurtigtaster"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Innstillinger for applikasjoner"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukjente kilder"</string>
-    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av programmer som ikke finnes på Android-markedet"</string>
-    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Nettbrettet og dine personlige opplysninger er mer sårbare for angrep av programmer fra ukjente kilder. Du godtar at du selv er ansvarlig for skader på nettbrettet eller tap av data som kan oppstå ved bruk av disse programmene."</string>
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av applikasjoner som ikke kommer fra Android-markedet"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Nettbrettet og dine personlige opplysninger er mer sårbare for angrep av applikasjoner fra ukjente kilder. Du godtar at du selv er ansvarlig for skader på nettbrettet eller tap av data som kan oppstå ved bruk av disse applikasjonene."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonen og dine personlige data er mer sårbare mot angrep fra applikasjoner som kommer fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som måtte oppstå fra bruk av slike applikasjoner."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Applikasjonsinformasjon"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
@@ -913,7 +912,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivert"</string>
-    <string name="no_applications" msgid="5190227407135243904">"Ingen programmer."</string>
+    <string name="no_applications" msgid="5190227407135243904">"Ingen applikasjoner."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlagring"</string>
@@ -951,9 +950,9 @@
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytt program"</string>
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Fikk ikke flyttet programmet. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
-    <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye programmer."</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye applikasjoner."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
-    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass for programmer"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass brukt av applikasjoner"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Vis og kontroller tjenester som kjører for øyeblikket"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Starter på nytt"</string>
@@ -1078,8 +1077,8 @@
     <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tilgjengelighetsskript"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Last ned tilgjengelighetsskript"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillat prog. å laste ned tilgjengelighetsskript fra Google"</string>
-    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Enkelte programmer kan be Google om å laste ned skript til tavleenheten som gjør programinnholdet mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på tavleenheten?"</string>
-    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Enkelte programmer kan be Google om å laste ned skript til telefonen som gjøres programinnholdet mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på telefonen?"</string>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Enkelte applikasjoner kan be Google om å laste ned skript til nettbrettet som gjør innholdet deres mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på nettbrettet?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Enkelte applikasjoner kan be Google om å laste ned skript til telefonen som gjør innholdet deres mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på telefonen?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"På/av-knapp"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Legg på med på/av"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Ved å trykke på av-knappen under en samtale, avsluttes samtalen i stedet for at skjermen slås av"</string>
@@ -1147,7 +1146,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Prøv å koble til en annen Bluetooth-enhet"</string>
     <string name="battery_desc_apps" msgid="6665712811746233450">"Batteri brukt av program"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Stopp eller avinstaller applikasjonen"</string>
-    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kontroller GPS manuelt, for å forhindre at programmer bruker funksjonen"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kontroller GPS manuelt, for å forhindre at applikasjoner bruker funksjonen"</string>
     <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Applikasjonen har muligens innstillinger som kan redusere batteribruken"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1338,7 +1337,7 @@
     <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi-konfigurering"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Koble til Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Kobler til Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Koblet til et Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Legg til et nettverk"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ikke tilkoblet"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Legg til nettverk"</string>
@@ -1368,11 +1367,11 @@
     <string name="add_account_label" msgid="7811707265834013767">"Legg til konto"</string>
     <string name="header_general_sync_settings" msgid="3487451896424238469">"Generelle synk.innst."</string>
     <string name="background_data" msgid="5779592891375473817">"Bakgrunnsdata"</string>
-    <string name="background_data_summary" msgid="3630389249212620467">"Programmer kan synkronisere, sende og motta data"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Apper kan når som helst synkronisere, sende og motta data"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Obs"</string>
-    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivering av bakgrunnsdata sparer batteri og reduserer datatrafikken. Noen programmer kan fortsatt bruke tilkoblingen for bakgrunnsdata."</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivering av bakgrunnsdata sparer batteri og reduserer datatrafikken. Det kan hende noen apper fortsatt bruker tilkoblingen for bakgrunnsdata."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Automatisk synkronisering"</string>
-    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programmer synkroniser data automatisk"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Applikasjoner synkroniserer data automatisk"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Administrer kontoer"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering er på"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Synkronisering er av"</string>
@@ -1386,7 +1385,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakter"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Velkommen til Google-synkronisering!"</font>\n"Synkroniser på Google-vis, slik at du har tilgang til dine kontakter, avtaler og mer – uansett hvor du befinner deg."</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Velkommen til Google-synkronisering!"</font>\n"Synkroniser på Google-måten, slik at du har tilgang til dine kontakter, avtaler og mer – uansett hvor du befinner deg."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Innstillinger for programsynkronisering"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data og synkronisering"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Endre passord"</string>
@@ -1397,8 +1396,8 @@
     <string name="really_remove_account_title" msgid="6574643117748564960">"Fjern konto"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Er du sikker på at du vil fjerne denne kontoen? Hvis du fjerner den, fjernes samtidig alle data som er tilknyttet kontoen. "\n"Vil du fortsette?"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Er du sikker på at du vil fjerne denne kontoen? Hvis du fjerner den, fjernes samtidig alle data som er tilknyttet kontoen. "\n"Vil du fortsette?"</string>
-    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Denne kontoen er påkrevd av ett eller flere programmer. Du kan kun fjerne den ved å tilbakestille nettbrettet til fabrikkstandard (dette sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
-    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Denne kontoen er påkrevd av ett eller flere programmer. Du kan kun fjerne den ved å tilbakestille telefonen til fabrikkstandard (dette sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Denne kontoen er påkrevd av enkelte applikasjoner. Du kan kun fjerne den ved å tilbakestille nettbrettet til fabrikkinnstillingene (noe som sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Denne kontoen er påkrevd av enkelte applikasjoner. Du kan kun fjerne den ved å tilbakestille telefonen til fabrikkstandard (noe som sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
     <string name="provider_label" msgid="7724593781904508866">"Push-abonnementer"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"Synkroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Kan ikke synkronisere manuelt"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 45b51ee..af28bbe 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nooit indien aangesloten"</item>
     <item msgid="6592896328877671197">"Nooit (gebruikt meer acculading)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Wanneer scherm dooft"</item>
+    <item msgid="8137861573803398334">"Nooit indien aangesloten"</item>
+    <item msgid="5996547094658157629">"Nooit (gebruikt meer acculading)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatisch"</item>
     <item msgid="6670588712989942178">"Alleen 5 GHz"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a9c8554..94179fe 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -272,7 +272,7 @@
     <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="2150571569618349332">"U kunt uw accounts, instellingen, gedownloade toepassingen en bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw tablet heeft gecodeerd, moet u een numerieke PIN-code 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="tablet" msgid="2150571569618349332">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden encrypten. Zodra u uw tablet heeft geëncrypt, moet u een numerieke PIN-code of wachtwoord opgeven om de tablet te decoderen wanneer u deze inschakelt. U kunt de encryptie van uw tablet alleen ongedaan maken door de fabrieksinstellingen te herstellen. Als u dit doet, worden al uw gegevens gewist."\n\n"Het encrypten 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 encryptieproces onderbreekt, gaan sommige of alle gegevens verloren."</string>
     <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden encrypten. Zodra u uw telefoon heeft geëncrypt, moet u een numerieke PIN-code of wachtwoord opgeven om de telefoon te decoderen wanneer u deze inschakelt. U kunt de encryptie van uw telefoon alleen ongedaan maken door de fabrieksinstellingen te herstellen. Als u dit doet, worden al uw gegevens gewist."\n\n"Het encrypten duurt een uur of langer. U moet beginnen met een opgeladen accu en moet de telefoon aangesloten laten op het stopcontact tot het encrypten is voltooid. Als u het encryptieproces onderbreekt, gaan sommige of alle gegevens verloren."</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>
@@ -281,7 +281,7 @@
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen PIN-code of wachtwoord voor schermvergrendeling"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"U moet een PIN-code of wachtwoord voor schermvergrendeling instellen voordat u de encryptie kunt starten."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Codering bevestigen"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Tablet coderen? Deze bewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen duurt een uur of langer en de tablet wordt meerdere keren opnieuw opgestart."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Tablet encrypten? Deze bewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het encrypten duurt een uur of langer en de tablet wordt meerdere keren opnieuw opgestart."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Telefoon encrypten? Deze bewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het encrypten duurt een uur of langer en de telefoon wordt meerdere keren opnieuw opgestart."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Coderen"</string>
     <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Melden wanneer een open netwerk beschikbaar is"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Beleid inzake verbreken van Wi-Fi-verbinding"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Overschakelen opgeven van Wi-Fi naar mobiele gegevens"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Aangeven wanneer de Wi-Fi-verbinding moet worden verbroken"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Er is een probleem opgetreden bij het wijzigen van de instelling"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fi-netwerk toevoegen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerken"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Netwerk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC-adres"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adres"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Niet beschikbaar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Bedrijfstijd"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Stand-bytijd"</string>
@@ -655,7 +655,7 @@
     <string name="memory_available" msgid="5052397223077021181">"Beschikbaar"</string>
     <string name="memory_size" msgid="5458889090691922288">"Totaal"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Berekenen…"</string>
-    <string name="memory_apps_usage" msgid="9079237985722858506">"Toepassingen"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Apps"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gedeelde opslag ontkoppelen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kaart ontkoppelen"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Draadloze netwerken"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Locatie in toepassingen (zoals Maps) bekijken via draadloze netwerken"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Locatie bepaald door Wi-Fi en/of mobiele netwerken"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Locatie bepaald via Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS-satellieten"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Bij lokaliseren nauwkeurig tot straatniveau"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Locatie bepalen tot op straatniveau (meer stroom nodig en luchtweergave)"</string>
@@ -870,7 +869,7 @@
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Beveilig uw telefoon tegen ongeoorloofd gebruik door het instellen van een persoonlijk schermdeblokkeringspatroon. "\n<font height="17">\n</font><b>"1"</b>" Op het volgende scherm ziet u hoe een voorbeeldpatroon wordt getekend. "\n<font height="17">\n</font><b>"2"</b>" Teken uw eigen persoonlijke deblokkeringspatroon als het voorbeeld is voltooid. U kunt verschillende patronen uitproberen, maar u moet minimaal vier punten met elkaar verbinden. "\n<font height="17">\n</font><b>"3"</b>" Teken uw patroon nogmaals ter bevestiging. "\n<font height="17">\n</font><b>"Bent u er klaar voor? Selecteer \'Volgende\'"</b>". "\n<font height="3">\n</font>"Als u uw telefoon niet wilt beveiligen, selecteert u \'Annuleren\'."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Toepassingen beheren"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Geïnstalleerde toepassingen beheren en verwijderen"</string>
-    <string name="applications_settings" msgid="3736173521008476946">"Toepassingen"</string>
+    <string name="applications_settings" msgid="3736173521008476946">"Apps"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Toepassingen beheren, sneltoetsen voor snelstarten instellen"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Toepassingsinstellingen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Onbekende bronnen"</string>
@@ -1025,7 +1024,7 @@
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Uw sneltoets voor <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) wordt gewist."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Annuleren"</string>
-    <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Toepassingen"</string>
+    <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Apps"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Sneltoetsen"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstinvoer"</string>
     <string name="input_method" msgid="5434026103176856164">"Invoermethode"</string>
@@ -1078,7 +1077,7 @@
     <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Toegankelijkheidsscripts"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Toegankelijkheidsscripts downloaden"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Toepassingen mogen toegankelijkheidsscripts downloaden via Google"</string>
-    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Sommige toepassingen kunnen Google vragen scripts naar uw tablet te downloaden die hun inhoud toegankelijker maakt. Weet u zeker dat u Google wilt toestaan toegankelijkheidsscripts op uw tablet te installeren?"</string>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Sommige apps kunnen Google vragen scripts naar uw tablet te downloaden die hun inhoud toegankelijker maakt. Weet u zeker dat u Google wilt toestaan toegankelijkheidsscripts op uw tablet te installeren?"</string>
     <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Sommige toepassingen kunnen Google vragen scripts naar uw telefoon te downloaden die hun inhoud toegankelijker maakt. Weet u zeker dat u Google wilt toestaan toegankelijkheidsscripts op uw telefoon te installeren?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Aan/uit-knop"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Knop beëindigt oproep"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index fdb52a8..e158357 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -42,8 +42,8 @@
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekund"</item>
     <item msgid="8881760709354815449">"30 sekund"</item>
-    <item msgid="7589406073232279088">"1 minuta"</item>
-    <item msgid="7001195990902244174">"2 minuty"</item>
+    <item msgid="7589406073232279088">"1 min"</item>
+    <item msgid="7001195990902244174">"2 min"</item>
     <item msgid="7489864775127957179">"5 min"</item>
     <item msgid="2314124409517439288">"10 min"</item>
     <item msgid="6864027152847611413">"30 min"</item>
@@ -53,8 +53,8 @@
     <item msgid="6736512735606834431">"5 sekund"</item>
     <item msgid="8044619388267891375">"15 sekund"</item>
     <item msgid="1822002388249545488">"30 sekund"</item>
-    <item msgid="8538071621211916519">"1 minuta"</item>
-    <item msgid="5663439580228932882">"2 minuty"</item>
+    <item msgid="8538071621211916519">"1 min"</item>
+    <item msgid="5663439580228932882">"2 min"</item>
     <item msgid="49888496216106852">"5 min"</item>
     <item msgid="9002737361305019353">"10 min"</item>
     <item msgid="4322676235684793329">"30 min"</item>
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nigdy, gdy podłączony"</item>
     <item msgid="6592896328877671197">"Nigdy (większe zużycie energii baterii)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Po wyłączeniu ekranu"</item>
+    <item msgid="8137861573803398334">"Nigdy po podłączeniu"</item>
+    <item msgid="5996547094658157629">"Nigdy (większe zużycie baterii)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatyczna"</item>
     <item msgid="6670588712989942178">"Tylko 5 GHz"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6a81eab..6aa3e5b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -220,7 +220,7 @@
     <string name="cancel" msgid="6859253417269739139">"Anuluj"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ustawienia"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ustawienia"</string>
-    <string name="settings_shortcut" msgid="8597387747077828217">"Wybierz skrót do ustawień"</string>
+    <string name="settings_shortcut" msgid="8597387747077828217">"Skrót do ustawień"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Tryb samolotowy"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Wyłącz wszystkie połączenia bezprzewodowe"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Wyłączanie połączeń bezprzewodowych..."</string>
@@ -255,7 +255,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortuj według strefy czasowej"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Godzina"</string>
-    <string name="lock_after_timeout" msgid="940509402681580537">"Czas oczekiwania"</string>
+    <string name="lock_after_timeout" msgid="940509402681580537">"Wygaszanie"</string>
     <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Zablokuj po <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> od automatycznego wygaszenia ekranu"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Pokaż informacje o właścicielu na ekranie blokady"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informacje o właścicielu"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Powiadom mnie, gdy będę w zasięgu otwartej sieci"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Zasady rozłączania Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Określ, kiedy przełączyć Wi-Fi na komórkowe połączenie danych"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Określ czas odłączenia od sieci Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Wystąpił problem ze zmianą ustawienia"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Dodaj sieć Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sieci Wi-Fi"</string>
@@ -587,7 +588,7 @@
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Automatycznie przełącz orientację przy obracaniu telefonu"</string>
     <string name="brightness" msgid="2354961343555249270">"Jasność ekranu"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
-    <string name="screen_timeout" msgid="6962654593018319466">"Czas oczekiwania"</string>
+    <string name="screen_timeout" msgid="6962654593018319466">"Wygaszanie"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekran wyłączy się automatycznie po upływie <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna jasność"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Sieć"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adres MAC karty Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adres Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Numer seryjny"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Niedostępny"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Czas działania"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Czas działania (włączony)"</string>
@@ -723,8 +723,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Ustawienia fabryczne"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Wymazuje wszystkie dane z tabletu"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Wymazuje wszystkie dane w telefonie"</string>
-    <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Spowoduje to wymazanie wszystkich danych z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:"\n\n<li>"danych konta Google,"</li>\n<li>"danych i ustawień systemu oraz aplikacji,"</li>\n<li>"pobranych aplikacji."</li></string>
-    <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Spowoduje to wymazanie wszystkich danych z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"danych konta Google,"</li>\n<li>"danych i ustawień systemu oraz aplikacji,"</li>\n<li>"pobranych aplikacji."</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"Skasujesz wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:"\n\n<li>"Dane konta Google,"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji,"</li>\n<li>"Pobrane aplikacje."</li></string>
+    <string name="master_clear_desc" product="default" msgid="2950536633526374209">"Skasujesz wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"dane konta Google,"</li>\n<li>"dane i ustawienia systemu oraz aplikacji,"</li>\n<li>"pobrane aplikacje."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na następujące konta:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Aby usunąć również muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Użyj sieci Wi-Fi"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Określ moją lokalizację w aplikacjach (takich jak Mapy), korzystając z sieci bezprzewodowych"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokalizacja określana jest za pomocą Wi-Fi i/lub sieci komórkowych"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokalizacja określona na podstawie sieci Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Użyj satelitów GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Określaj lokalizację z dokładnością do ulicy"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)"</string>
@@ -1002,7 +1001,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
     <string name="show_password" msgid="2198798062604049206">"Widoczne hasła"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Pokazuj hasło podczas wpisywania"</string>
-    <string name="ime_security_warning" msgid="812267421486877917">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Metoda pochodzi z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tej metody wprowadzania?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Ten sposób wprowadzania tekstu może gromadzić całą wpisaną treść, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Dotyczy to aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tego sposobu wprowadzania tekstu?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Słownik użytkownika"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
@@ -1028,9 +1027,9 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplikacje"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Skróty"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Wprowadzanie tekstu"</string>
-    <string name="input_method" msgid="5434026103176856164">"Metoda wprowadzania"</string>
-    <string name="current_input_method" msgid="2146807723398303917">"Bieżąca metoda wprowadzania"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"Wybór metody wprowadzania"</string>
+    <string name="input_method" msgid="5434026103176856164">"Sposób wprowadzania tekstu"</string>
+    <string name="current_input_method" msgid="2146807723398303917">"Bieżący sposób wprowadzania tekstu"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Wybór sposobu wprowadzania tekstu"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatyczny"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Zawsze pokazuj"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Zawsze ukrywaj"</string>
@@ -1362,7 +1361,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Protokół EAP nie jest obsługiwany"</string>
     <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Podczas procesu konfiguracji nie można skonfigurować połączenia Wi-Fi zabezpieczonego protokołem EAP. Można to zrobić po zakończeniu tego procesu, wybierając w Ustawieniach opcję "<b>"Sieci zwykłe i bezprzewodowe"</b>"."</string>
     <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Nawiązanie połączenia może potrwać kilka minut..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dotknij opcji "<b>"Dalej"</b>", aby kontynuować konfigurację."\n\n"Dotknij opcji "<b>"Wstecz"</b>", aby połączyć się z inną siecią Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dotknij opcji "<b>"Dalej"</b>", aby kontynuować konfigurację."\n\n"Wybierz "<b>"Wróć"</b>", aby połączyć się z inną siecią Wi-Fi."</string>
     <string name="account_sync_settings_title" msgid="4578227872921044660">"Ustawienia synchronizacji"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"W tej chwili występują problemy z synchronizacją. Synchronizacja będzie możliwa wkrótce."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Dodaj konto"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index dfdbd62..bc027c9 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nunca quando ligado"</item>
     <item msgid="6592896328877671197">"Nunca (utiliza mais bateria)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Ao desligar o ecrã"</item>
+    <item msgid="8137861573803398334">"Nunca quando ligado"</item>
+    <item msgid="5996547094658157629">"Nunca (utiliza mais bateria)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automático"</item>
     <item msgid="6670588712989942178">"Apenas 5 GHz"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 274d68c..ae60d16 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificar-me quando estiver disponível uma rede aberta"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desligar Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especificar quando mudar de Wi-Fi para dados móveis"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especificar quando desligar do Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema ao alterar a definição"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Adicionar rede Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Rede"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Endereço MAC de Wi-Fi:"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Indisponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de actividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividade"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Utilizar redes sem fios"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Ver localização em aplicações (como o Google Maps) utilizando redes sem fios"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Localização determinada por redes Wi-Fi e/ou móveis"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Localização determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Ao localizar, precisão a nível de rua"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar ao nível da rua (exige mais bateria e vista do céu)"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index c471269..56ebce7 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nunca quando conectado"</item>
     <item msgid="6592896328877671197">"Nunca (usa mais energia da bateria)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Quando a tela é desativada"</item>
+    <item msgid="8137861573803398334">"Nunca quando conectado"</item>
+    <item msgid="5996547094658157629">"Nunca (usa mais energia da bateria)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automático"</item>
     <item msgid="6670588712989942178">"Apenas 5 GHz"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ea8caad..de0d254 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Receber notificação quando uma rede aberta estiver disponível"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desconexão de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especificar quando alternar de Wi-Fi para dados móveis"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especificar quando desconectar da rede Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema com a mudança de configuração"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Adicionar rede Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Rede"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Endereço MAC da rede Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Não disponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de atividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo de ativação"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Usar redes sem fio"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Veja o local nos aplicativos (como o Google Maps) usando redes sem fio"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Local determinado pela rede Wi-Fi e/ou pelas redes móveis"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Localização determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Usar satélites GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Durante a localização, usar precisão no nível de rua"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar no nível da rua (exige mais bateria e visão do céu)"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 4639f11..0d87979 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -518,6 +518,8 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"M\'avisar sch\'ina rait averta è disponibla"</string>
     <!-- outdated translation 1367731352485585528 -->     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Directiva da standby WLAN"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Definir cura ch\'i duai vegnir midà da WLAN sin la rait da telefon"</string>
+    <!-- no translation found for wifi_setting_sleep_policy_summary_wifi_only (5025244230722670496) -->
+    <skip />
     <!-- outdated translation 5103670439972135148 -->     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Cun endrizzar ina directiva da standby è cumparì in problem."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Agiuntar ina rait WLAN"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Raits WLAN"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index a59cd14..69a4834 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Niciodată când este conectat"</item>
     <item msgid="6592896328877671197">"Niciodată (utilizează mai multă energie a bateriei)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"La dezactivarea ecranului"</item>
+    <item msgid="8137861573803398334">"Niciodată când este conectat"</item>
+    <item msgid="5996547094658157629">"Niciodată (mai multă energie)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automat"</item>
     <item msgid="6670588712989942178">"Numai pe 5 GHz"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 102769f..9fc4bb7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Doresc să fiu notificat când este disponibilă o reţea deschisă"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Politica de deconectare Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Indicaţi când să se comute de la Wi-Fi la date mobile"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Indicaţi când doriţi deconectarea de la Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"A apărut o problemă la modificarea setării"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Adăugaţi o reţea Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Reţele Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Reţea"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresă MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresă Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Număr de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Indisponibilă"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durată de funcţionare"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Durată de activitate"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Utilizaţi reţele wireless"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Vedeţi locaţia în aplicaţii (cum ar fi Hărţi Google) cu ajutorul reţelelor wireless"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Locaţie stabilită prin Wi-Fi şi/sau reţele mobile"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Locaţie stabilită prin Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utilizaţi sateliţi GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Localizare efectuată la nivel de stradă"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizaţi până la nivelul străzii (necesită mai multă energie a bateriei plus vedere spre cer)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Aplicaţiile pot oricând sincroniza, trimite şi primi date"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Atenţie"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Dezactivarea datelor de fundal creşte durata de viaţă a bateriei şi reduce nivelul de utilizare a datelor. Anumite aplicaţii pot utiliza în continuare conexiunea de date de fundal."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Sincronizare automată"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronizare automată"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplicaţiile sincronizează datele automat"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Gestionaţi conturi"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinc. este ACTIVATĂ"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Eroare de sincroniz."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Setări copie de rezervă"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Creaţi o copie de rezervă a setărilor dvs."</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizaţi acum"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Anulaţi sincronizarea"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizaţi acum"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Anulaţi sincronizarea"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Atingeţi pentru a sincroniza acum<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Agendă"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Agendă"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" "\n"O abordare Google asupra sincronizării datelor, care permite accesul la persoanele de contact, întâlniri şi multe alte informaţii, oriunde v-aţi afla."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Setări privind sincronizarea aplicaţiei"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datele şi sincronizarea"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 51687f5..ddcf98d 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Никогда, если есть питание от сети"</item>
     <item msgid="6592896328877671197">"Никогда (повысится расход заряда батареи)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"При выключении экрана"</item>
+    <item msgid="8137861573803398334">"Никогда при питании от сети"</item>
+    <item msgid="5996547094658157629">"Никогда (выше расход энергии)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Авто"</item>
     <item msgid="6670588712989942178">"Только 5 ГГц"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a6f9ac8..4895ae6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -75,7 +75,7 @@
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"Разрядка батареи"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряжается"</string>
-    <string name="battery_info_status_full" msgid="2824614753861462808">"Заряжена"</string>
+    <string name="battery_info_status_full" msgid="2824614753861462808">"Батарея заряжена"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Не подключено"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Питание от сети"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
@@ -198,7 +198,7 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-карта используется в качестве устройства массовой памяти"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-накопитель можно отключить"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"SD-карта может быть извлечена"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен во время использования!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен при исп.!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-карта была извлечена во время использования!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Использовано байтов:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Сканирование USB-накопителя..."</string>
@@ -293,23 +293,23 @@
     <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Ошибка шифрования"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Шифрование прервано и не может быть возобновлено. Чтобы получить возможность пользоваться планшетным ПК, необходимо выполнить сброс настроек, при этом все данные будут удалены. После сброса настроек можно повторно запустить процедуру шифрования."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Шифрование прервано и не может быть возобновлено. Чтобы получить возможность пользоваться телефоном, необходимо выполнить сброс настроек, при этом все данные будут удалены. После сброса настроек можно повторно запустить процедуру шифрования."</string>
-    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Настройка блокировки экрана"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Настройка блокировки экрана"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Настройка блок. экрана"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Настройка блок. экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Сменить способ блокировки"</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_set_unlock_off_title" msgid="1613932765246180079">"Отключение"</string>
     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Никогда не блокировать экран"</string>
     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Нет защиты"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Не требует граф. кода, PIN-кода или пароля для разбл. экрана"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Откл. граф. ключа, PIN, пароля разбл. экрана"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Графический ключ"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Требовать графический ключ для разбл. экрана"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Создать графический ключ для разблокировки экрана"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Требовать цифровой PIN-код для разбл. экрана"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Создать цифровой PIN-код для разбл. экрана"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Требовать пароль для разблокировки экрана"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Создать пароль для разблокировки экрана"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Запрещено удаленным администратором"</string>
-    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Выкл."</string>
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Откл."</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Нет защиты"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Защита графическим ключом"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Защита PIN-кодом"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сообщать при обнаружении открытой сети"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Правила отключения от сети Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"При каких условиях переключаться с Wi-Fi на сотовую сеть"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Настройки отключения от сети Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Не удалось изменить этот параметр"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Добавить сеть Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сети Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Сеть"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-адрес Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Серийный номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Время с момента включения"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Время работы"</string>
@@ -654,14 +654,14 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-карта"</string>
     <string name="memory_available" msgid="5052397223077021181">"Доступно"</string>
     <string name="memory_size" msgid="5458889090691922288">"Всего"</string>
-    <string name="memory_calculating_size" msgid="2188358544203768588">"Выполняется расчет..."</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Идет подсчет..."</string>
     <string name="memory_apps_usage" msgid="9079237985722858506">"Приложения"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Мультимедиа"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Безопасное извлечение"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Отключить внутр. USB-накопитель"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключение SD-карты для ее безопасного извлечения из устройства"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель для подключения"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Вставьте SD-карту для подключения"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Подключить USB-накопитель"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Подключить SD-карту"</string>
@@ -670,7 +670,7 @@
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Очистить USB-накопитель"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистить SD-карту"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии."</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаление с SD-карты всех данных, включая музыку и фотографии"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаляет все данные с SD-карты, например музыку и фотографии"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Недоступно"</string>
     <string name="read_only" msgid="6702420168629076340">" (только для чтения)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Отключить USB-накопитель"</string>
@@ -728,7 +728,7 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"В настоящее время вы выполнили вход в следующие аккаунты:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо удалить всю информацию с "<b>"USB-накопителя"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Чтобы удалить музыку, фотографии и другие данные пользователя, необходимо очистить "<b>"SD-карту"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Очистить USB-накопитель"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Очистить SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Удалить с USB-накопителя музыку, фотографии и все другие данные."</string>
@@ -795,17 +795,16 @@
     <string name="location_network_based" msgid="8815705866861993344">"Беспроводные сети"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Использовать Wi-Fi и сотовые сети для определения местоположения"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Использовать Wi-Fi и сотовые сети для определения местоположения"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположение определяется с помощью Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Спутники GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Координаты на уровне улиц"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Использовать GPS для определения местоположения (высокий расход энергии)"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Использовать A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Использовать сервер для A-GPS (снимите флажок для менее интенсивного использования сети)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Использовать сервер для A-GPS (снимите флажок для улучшения работы GPS)"</string>
-    <string name="use_location_title" msgid="3659340070401464551">"Использовать данные о местоположении при поиске"</string>
-    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Использовать данные о местоположении в поиске и других службах Google"</string>
-    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Данные о местоположении используются для улучшения работы поиска и других служб Google"</string>
+    <string name="use_location_title" msgid="3659340070401464551">"Учитывать мое местоположение при поиске"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Учитывать мое местоположение при поиске и в других службах Google"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Данные о местоположении позволяют улучшить работу поиска и других служб Google"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"О планшетном ПК"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"О телефоне"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Просмотр юридической информации, состояния планшетного ПК и версии ПО"</string>
@@ -866,7 +865,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="3692151094288835065">"Защитите свой планшет от несанкционированного использования, создав личный графический ключ для разблокировки экрана. На следующем экране пальцем соедините точки в любой последовательности. Необходимо соединить хотя бы четыре точки. "\n\n"Готовы? Нажмите \"Далее\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетом. Для этого соедините в произвольном порядке не менее четырех точек. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Защитите телефон от несанкционированного использования, создав собственный графический ключ разблокировки экрана. "\n<font height="17">\n</font><b>"1"</b>"  На следующем экране показан пример вычерчивания ключа. "\n<font height="17">\n</font><b>"3"</b>"  Подготовьтесь и создайте собственный графический ключ разблокировки. Можно экспериментировать с ключами, но в них должны быть соединены как минимум четыре точки. "\n<font height="17">\n</font><b>"3"</b>"  Для подтверждения начертите графический ключ повторно. "\n<font height="17">\n</font><b>" Готовы? Нажмите \"Далее\""</b>". "\n<font height="3">\n</font>"Если вы не хотите устанавливать защиту телефона, выберите \"Отмена\"."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Управление приложениями"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Управление установленными приложениями и их удаление"</string>
@@ -1283,14 +1282,14 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не настроено)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище регистрационных данных"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Доступ к хранилищу"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и рег. данных"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и учет. данных"</string>
     <string name="credentials_install" product="nosdcard" msgid="1395748667227729987">"Установка с USB-накопителя"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Установка с SD-карты"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="3679446246093149828">"Устанавливать сертификаты с USB-накопителя"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установить сертификаты с SD-карты"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Установить пароль"</string>
     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установить или изменить пароль для хранилища регистрационных данных"</string>
-    <string name="credentials_reset" msgid="3239382277144980418">"Очистить регистрационные данные"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Очистить учетные данные"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Удалить все содержание и сбросить пароль"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Введите пароль для хранилища регистрационных данных."</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index fa588cc..9a5ee5d 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nikdy pri zapnutom napájaní"</item>
     <item msgid="6592896328877671197">"Nikdy (spotrebuje sa viac energie batérie)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Po vypnutí obrazovky"</item>
+    <item msgid="8137861573803398334">"Nikdy pri zapnutom napájaní"</item>
+    <item msgid="5996547094658157629">"Nikdy (vyššia spotreba batérie)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Auto"</item>
     <item msgid="6670588712989942178">"Iba 5 GHz"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6b6e6f9..6ef0998 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Oznamovať dostupné nezabezpečené siete"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Pravidlá odpojenia siete Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Určiť, kedy prepnúť zo siete Wi-Fi na mobilný prenos údajov"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Určte, kedy odpojiť od siete Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pri zmene nastavení sa vyskytol problém"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Pridať sieť Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Siete Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Sieť"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresa MAC siete Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa zariadenia Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nie sú k dispozícii"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba prevádzky"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba prevádzky"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Zameranie pomocou bezdrôtovej siete"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Zobrazuje polohu v aplikáciách (ako Mapy) pomocou bezdrôtových sietí"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Poloha je zameraná pomocou sietí Wi-Fi alebo mobilných sietí"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Poloha je určená podľa siete Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Použiť satelity GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Zameranie je s presnosťou na úrovni ulíc."</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Umožňuje zamerať na úrovni ulíc (vyžaduje vyššiu spotrebu batérie a výhľad na oblohu)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Aplikácie môžu kedykoľvek synchronizovať, odosielať a prijímať údaje."</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Pozor"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Zakázanie prenosu údajov na pozadí šetrí batériu a znižuje objem použitých údajov. Niektoré aplikácie môžu používať dátové pripojenie na pozadí aj napriek tomuto nastaveniu."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Automatická synchronizácia"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatická synchronizácia"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikácie synchronizujú údaje automaticky"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Spravovať účty"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronizácia je ZAPNUTÁ"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Chyba synchronizácie"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Zálohovať nastavenia"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Zálohovať moje nastavenia"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizovať"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Zrušiť synchronizáciu"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizovať"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Zrušiť synchronizáciu"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Dotykom vykonáte synchronizáciu<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendár"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Kalendár"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Víta vás služba Google Sync"</font>" "\n"Spoločnosť Google pomocou nej synchronizuje údaje a umožňuje tak používateľom pristupovať ku kontaktom, stretnutiam a ďalším informáciám, kdekoľvek sa nachádzate."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Nastavenia synchronizácie aplikácií"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Údaje a synchronizácia"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index e6949e4..97a4336 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Nikoli, ko je naprava priklopljena"</item>
     <item msgid="6592896328877671197">"Nikoli (porabi več energije)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Ko se zaslon izklopi"</item>
+    <item msgid="8137861573803398334">"Nikoli, ko je naprava priključena"</item>
+    <item msgid="5996547094658157629">"Nikoli (porabi več energije)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Samodejno"</item>
     <item msgid="6670588712989942178">"Samo 5 GHz"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c39fb9c..762fa62 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Obvesti me, ko bo na voljo odprto omrežje"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Pravilnik o izklopu iz omrežja Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Navedite, kdaj preklopiti z brezžične na mobilno podatkovno storitev"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Določite, kdaj se naj prekine povezava z omrežjem Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Težava pri spreminjanju nastavitve"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Dodaj brezžično omrežje"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Brezžična omrežja"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Omrežje"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Naslov MAC za brezžično omrežje"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Naslov Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serijska številka"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ni na voljo"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Čas delovanja"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Čas delovanja"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Uporabljaj brezžična omrežja"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Prikaži lokacijo v programih (na primer v Zemljevidih) z uporabo brezžičnih omrežij"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Določanje lokacije z brezžičnimi in/ali mobilnimi omrežji"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokacija, ugotovljena prek omrežja Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Uporabi satelite GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Določanje lokacije do ravni ulice"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Določi lokacijo v pogledu ulic (za to potrebujete več energije in pogled na nebo)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Programi lahko kadar koli sinhronizirajo, pošiljajo in prejemajo podatke"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Pozor"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Če onemogočite podatke v ozadju, podaljšate življenjsko dobo baterije in zmanjšate rabo podatkov. Nekateri programi bodo mogoče še vedno potrebovali povezavo s podatki v ozadju."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Samodejna sinhronizacija"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Samodejna sinhronizacija"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Programi samodejno sinhronizirajo podatke"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Upravljanje z računi"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinhroniz. je VKLOP."</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Sinhron. napaka"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Varnostno kopiranje nastavitev"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Varnostno kopiranje nastavitev"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinhroniziraj"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Prekliči sinhronizacijo"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinhroniziraj"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Prekliči sinhronizacijo"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Pritisnite, če želite sinhronizirati<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Koledar"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Stiki"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Koledar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Stiki"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" "\n"Googlov način sinhroniziranja podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov ne glede na to, kje ste."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Nastavitve sinhronizacije programov"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podatki in sinhronizacija"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 71a7d97..b2e6580 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Никад када је укључен"</item>
     <item msgid="6592896328877671197">"Никад (користи више енергије батерије)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Када се екран искључи"</item>
+    <item msgid="8137861573803398334">"Никад када је прикључен"</item>
+    <item msgid="5996547094658157629">"Никад (брже трошење батерије)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Аутоматски"</item>
     <item msgid="6670588712989942178">"Само на 5 GHz"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 787840e..30f9507 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Обавести ме када је отворена мрежа доступна"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Смернице за прекид везе са Wi-Fi мрежом"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Одређивање времена пребацивања са Wi-Fi мреже на мобилну мрежу података"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Наведите када треба прекинути везу са Wi-Fi мрежом"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Дошло је до проблема приликом промене подешавања"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Додај Wi-Fi мрежу"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мреже"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Мрежа"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi Mac адреса"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth адреса"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Серијски број"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време рада"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време буђења"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Користи бежичне мреже"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Приказивање локације у апликацијама (као што су Мапе) помоћу бежичних мрежа"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Локацију одређују Wi-Fi и/или мобилне мреже"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Локација се одређује помоћу Wi-Fi-ја"</string>
     <string name="location_gps" msgid="6296125378829097831">"Користи GPS сателите"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Приликом лоцирања тачност је на нивоу улице"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Лоцирај на нивоу улице (захтева још батерије и поглед на небо)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Апликације увек могу да синхронизују, шаљу и примају податке"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Пажња"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Ако онемогућите позадинске податке, батерија ће трајати дуже, а употреба података ће бити мања. Неке апликације ће можда и даље користити везу са позадинским подацима."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Аутоматски синхронизуј"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Аутоматски синхронизуј"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Апликације синхронизују податке аутоматски"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Управљање налозима"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Синхрон. је УКЉУЧЕНА"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Грешка при синхрон."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Направи резервну копију подешавања"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Прављење резервне копије подешавања"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронизуј"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Откажи синхронизацију"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронизуј одмах"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Откажи синхронизацију"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Додирните да бисте синхронизовали одмах<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добро дошли у Google синхронизацију!"</font>" "\n"Google-ов приступ синхронизовању података како би се омогућио приступ контактима, обавезама и још много чему без обзира где се налазите."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Подешавања синхронизације апликације"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Подаци и синхронизација"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 5b64a2a..b5d7381 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Aldrig när den är inkopplad"</item>
     <item msgid="6592896328877671197">"Aldrig (batteriförbrukningen ökar)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"När skärmen är avstängd"</item>
+    <item msgid="8137861573803398334">"Aldrig när den är inkopplad"</item>
+    <item msgid="5996547094658157629">"Aldrig (drar mer batteri)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Automatiskt"</item>
     <item msgid="6670588712989942178">"Endast 5 GHz"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 600f109..35b4bdf 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -270,10 +270,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera pekdatorn"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kräv PIN-kod eller lösenord för att dekryptera pekdatorn varje gång den slås på"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Kräv PIN-kod eller lösenord för att dekryptera telefonen varje gång den slås på"</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 den slås på"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"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 slår på enheten för att den ska dekrypteras. Pekdatorn kan inte avkrypteras 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="7366703764847750586">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat telefonen måste du ange en PIN-kod eller ett lösenord varje gång slår på enheten för att den ska dekrypteras. Telefonen kan inte avkrypteras utan att standardinställningarna återställs, vilket innebär att alla data tas bort."\n\n"Krypteringen kan 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="7366703764847750586">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat telefonen måste du ange en PIN-kod eller ett lösenord varje gång slår på enheten för att den ska dekrypteras. Telefonen kan inte avkrypteras 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_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="5920622844033087792">"Ladda batteriet och försök igen."</string>
@@ -301,7 +301,7 @@
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Av"</string>
     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Lås aldrig skärmen"</string>
     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Oskyddad"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Kräv inte någon typ av lösenord för att låsa upp skärmen"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Kräver ej unikt lösenord för att låsa upp skärmen"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Grafiskt lösenord"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Kräv grafiskt lösenord för att låsa upp"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Meddela mig när ett öppet nätverk är tillgängligt"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi-bortkopplingspolicy"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Ange när du vill växla från Wi-Fi till mobildata"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Ange när du vill koppla från Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ett problem inträffade när inställningen ändrades"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Lägg till Wi-Fi-nätverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-nätverk"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Nätverk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi Mac-adress"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adress"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Inte tillgängligt"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tid sedan systemstart"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktiveringstid"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Använd trådlösa nätverk"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Se plats i programmen (till exempel kartor) med hjälp av trådlösa nätverk"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Plats fastställs av Wi-Fi och/eller mobila nätverk"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Platsen fastställs av Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Använd GPS-satelliter"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Korrekt på gatunivå när du söker"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Hitta till gatunivå (kräver mer batteri och fungerar endast utomhus)"</string>
@@ -997,7 +996,7 @@
     <string name="auto_replace_summary" msgid="370288728200084466">"Rätta felskrivna ord"</string>
     <string name="auto_caps" msgid="6379232078052591265">"Automatiska versaler"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Första ordet i en mening ska inledas med versal"</string>
-    <string name="auto_punctuate" msgid="4595367243950425833">"Automatisk punkt"</string>
+    <string name="auto_punctuate" msgid="4595367243950425833">"Automatisk interpunktion"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Inställningar för fysiskt tangentbord"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tryck på blanksteg två gånger om du vill infoga \".\""</string>
     <string name="show_password" msgid="2198798062604049206">"Synliga lösenord"</string>
@@ -1335,7 +1334,7 @@
     <string name="sound_category_calls_title" msgid="3688531959256239012">"Inkommande samtal"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Aviseringar"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Signaler"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi-konfiguration"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"WiFi-konfiguration"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Anslut till Wi-Fi-nätverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Ansluter till Wi-Fi-nätverk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
     <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ansluten till Wi-Fi-nätverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 89efe7f..827c981 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"ไม่ใช้เมื่อเสียบปลั๊ก"</item>
     <item msgid="6592896328877671197">"ไม่ใช้ (ใช้พลังงานแบตเตอรี่มากขึ้น)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"เมื่อปิดหน้าจอ"</item>
+    <item msgid="8137861573803398334">"ไม่ใช้เมื่อเสียบปลั๊ก"</item>
+    <item msgid="5996547094658157629">"ไม่ใช้ (ใช้พลังงานแบตเตอรี่มากขึ้น)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"อัตโนมัติ"</item>
     <item msgid="6670588712989942178">"5 GHz เท่านั้น"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8c06fb7..bd6b627 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"แจ้งฉันเมื่อมีเครือข่ายเปิดให้ใช้งานได้"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"นโยบายการยกเลิกการเชื่อมต่อ Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"ระบุเมื่อต้องการเปลี่ยนจาก Wi-Fi เป็นข้อมูลมือถือ"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"ระบุเวลาที่จะยกเลิกการเชื่อมต่อจาก Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"มีปัญหาในการเปลี่ยนแปลงการตั้งค่า"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"เพิ่มเครือข่าย Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"เครือข่าย Wi-Fi"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"เครือข่าย"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"ที่อยู่ Wi-Fi Mac"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ที่อยู่บลูทูธ"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"หมายเลขซีเรียล"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"ไม่ว่าง"</string>
     <string name="status_up_time" msgid="7294859476816760399">"เวลาทำงาน"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"เวลาการทำงาน"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"ใช้เครือข่ายไร้สาย"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"เลือกตำแหน่งในแอปพลิเคชัน (เช่น แผนที่) โดยใช้เครือข่ายไร้สาย"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"ตำแหน่งที่กำหนดโดยเครือข่าย Wi-Fi และ/หรือเครือข่ายมือถือ"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"ตำแหน่งที่กำหนดโดย Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"ใช้ดาวเทียม GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"เมื่อค้นหาตำแหน่ง ให้ระบุถนนให้ถูกต้อง"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"ระบุถึงระดับถนน (ต้องใช้แบตเตอรี่มากขึ้นและใช้มุมมองท้องฟ้าด้วย)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"แอปพลิเคชันสามารถซิงค์ ส่ง และรับข้อมูลได้ตลอดเวลา"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"โปรดทราบ"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"การปิดใช้งานข้อมูลพื้นหลังจะทำให้แบตเตอรี่ใช้งานได้ยาวนานขึ้นและลดการใช้ข้อมูลลง แอปพลิเคชันบางอย่างอาจยังคงใช้การเชื่อมต่อข้อมูลพื้นหลังอยู่"</string>
-    <string name="sync_automatically" msgid="7558810110682562376">"การซิงค์อัตโนมัติ"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"ซิงค์อัตโนมัติ"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"แอปพลิเคชันจะซิงค์ข้อมูลโดยอัตโนมัติ"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"จัดการบัญชี"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"เปิดใช้การซิงค์"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"ข้อผิดพลาดในการซิงค์"</string>
     <string name="settings_backup" msgid="2274732978260797031">"สำรองข้อมูลการตั้งค่า"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"สำรองข้อมูลการตั้งค่า"</string>
-    <string name="sync_menu_sync_now" msgid="6154608350395805683">"ซิงค์ตอนนี้"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"ซิงค์เดี๋ยวนี้"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ยกเลิกการซิงค์"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"แตะเพื่อซิงค์เดี๋ยวนี้ <xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"ปฏิทิน"</string>
-    <string name="sync_contacts" msgid="9174914394377828043">"รายชื่อ"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"สมุดโทรศัพท์"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"ยินดีต้อนรับสู่ Google Sync"</font>\n"วิธีการของ Google ในการซิงค์ข้อมูลเพื่อให้คุณเข้าถึงสมุดโทรศัพท์ นัดหมาย และข้อมูลอื่นๆ ของคุณได้จากทุกที่"</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"การตั้งค่าการซิงค์แอปพลิเคชัน"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"ข้อมูลและการซิงค์"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 7cf11c6..d25bba5 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Huwag kailanman kapag naka-plug in"</item>
     <item msgid="6592896328877671197">"Hindi Kailanman (gumagamit ng higit pang lakas ng baterya)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kapag naka-off ang screen"</item>
+    <item msgid="8137861573803398334">"Hindi kapag naka-plug in"</item>
+    <item msgid="5996547094658157629">"Hindi (gumagamit ng baterya)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Awto"</item>
     <item msgid="6670588712989942178">"5 GHz lang"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 31384a6..2cc4a8f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"I-notify ako kapag available ang bukas na network"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Patakaran sa pag-alis sa pagkakakonekta ng Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Tukuyin kung kailan lilipat mula sa Wi-Fi patungong data ng mobile"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Tukuyin kung kailan aalisin ang koneksyon mula sa Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Nagkaproblema sa pagbabago ng setting"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Magdagdag ng Wi-Fi network"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mga Wi-Fi network"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Network"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Address ng Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Address ng bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Hindi available"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oras na naka-up"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Oras ng gising"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Gumamit ng mga wireless na network"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Tingnan ang lokasyon sa mga application (gaya ng Maps) gamit ang mga wireless na network"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Natukoy ang lokasyon ng Wi-Fi at/o mga mobile network"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Natukoy ang lokasyon ng Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Gumamit ng mga GPS satellite"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Kapag naghahanap, tumpak hanggang sa antas ng kalye"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Hanapin sa antas ng kalye (kinakailangan ng maraming baterya pati view ng sky)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Kaya mag-sync, padala, at tanggap data ang app. anuman oras"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Bigyang-pansin"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Pinapalawak ng hindi pagpapagana sa data ng background ang buhay ng baterya at pinapababa ang paggamit ng data. Maaari pa ring gamitin ng ilang application ang koneksyon ng data sa background."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Awtomatikong pag-sync"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Awtomatikong pag-sync"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Awtomatikong sini-sync ng mga application ang data"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Pamahalaan ang mga account"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"NAKA-ON ang pag-sync"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Error sa pag-sync"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Mga setting ng back up"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"I-back up ang aking mga setting"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"I-sync ngayon"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Kanselahin ang pag-sync"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"I-sync ngayon"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Kanselahin ang pag-sync"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Galawin upang mag-sync ngayon<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Kalendaryo"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Mga Contact"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Kalendaryo"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Mga Contact"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Maligayang pagdating sa Google sync!"</font>" "\n"Isang paraan ng Google sa pag-synchronize ng data upang payagan ang access sa iyong mga contact, appointment, at higit pa kahit nasaan ka man."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Mga setting ng pag-sync ng application"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data at pag-synchronize"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 9a03a0a..5413b00 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Takılı olduğunda hiçbir zaman"</item>
     <item msgid="6592896328877671197">"Hiçbir zaman (daha çok pil gücü kullanır)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Ekran kapandığında"</item>
+    <item msgid="8137861573803398334">"Prizde olduğunda hiçbir zaman"</item>
+    <item msgid="5996547094658157629">"Hiçbr zaman (dh fzl pil tüktr)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Otomatik"</item>
     <item msgid="6670588712989942178">"Yalnızca 5 GHz"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 59757ae..760f05e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -274,8 +274,8 @@
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Şifreli"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"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="7366703764847750586">"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_button_text" product="tablet" msgid="1189623490604750854">"Şifreli tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Şifreli telefon"</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="5920622844033087792">"Lütfen pilinizi şarj edip tekrar deneyin."</string>
     <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Lütfen ş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>
@@ -376,7 +376,7 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ile eşleştirmek için, şu passkey kodunu gösterdiğini doğrulayın: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"eşleşme istiyor."</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"Eşleştirmek için \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" üzerinde \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" girin, ardından return veya enter tuşuna basın."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Çift"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Eşleştir"</string>
     <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Eşleştirme"</string>
     <string name="bluetooth_remote_device" msgid="2406662802908395389">"bluetooth cihazı"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Dikkat"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Açık bir ağ kullanılabilir olduğunda bana bildir"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Kablosuz bağlantı kesme politikası"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Kablosuzdan mobil veriye geçme zamanını belirt"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Kablosuz bağlantısının ne zaman kesileceğini belirtin"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ayarı değiştirirken bir sorun oluştu"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Kablosuz ağ ekle"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Kablosuz ağlar"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Ağ"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Kablosuz MAC adresi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresi"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Seri numara"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Kullanılamıyor"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Açık kalma süresi"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Uyanık geçen süre"</string>
@@ -661,7 +661,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Dahili USB depolamanın bağ kes"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Güvenle çıkarabilmnz için SD kartın bağl kesin"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bğl için USB dep brm takn"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bağlantı için USByi takın"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Eklemek için bir SD kart yerleştirin"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB depl birimini ekleyin"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD kartı ekle"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Kablosuz ağ kullan"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Kablosuz ağları kullanarak uygulamalarda (Google Haritalar gibi) konumu gör"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Konum kablosuz ve/veya cep telefonu ağları tarafından belirlenir"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Konum, Kablosuz tarafından belirlendi"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS uydularını kullan"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Yer bulunurken sokak düzeyinde kesinlik"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Sokak düzeyinde yer bul (daha fazla pil ve gökyüzü görünümü gerektirir)"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 1ae3dfc..40ea9ea 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Ніколи в підключ. стані"</item>
     <item msgid="6592896328877671197">"Ніколи (споживає більше енергії батареї)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Під час вимкнення екрана"</item>
+    <item msgid="8137861573803398334">"Ніколи в підключеному стані"</item>
+    <item msgid="5996547094658157629">"Ніколи (викор. більше заряду)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Автоматично"</item>
     <item msgid="6670588712989942178">"Лише 5 ГГц"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3607e08..4e07f04 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сповіщати мене про доступність відкритої мережі"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Політика від’єднання Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Укажіть, коли переключ. від Wi-Fi до моб. даних"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Укажіть, коли від’єднуватися від Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Виникла проблема зі зміною налаштувань"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Додати Wi-Fi мережу"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мережі"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Мережа"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-адреса Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адреса Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Серійний номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступне"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Час гот."</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Час активн."</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Викор. бездротові мережі"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Див. місцезнах. в програмах (напр. у Картах), викор. бездрот. мережі"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Місцезнах., визначене Wi-Fi та/чи мобільними мережами"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Місцезнаходження, визначене Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Викор. супутники GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Визначати місцезнаходження до рівня вулиці"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Визнач. місц. до рівня вул. (протеб. більше батареї й вигляд неба)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Програми можуть будь-коли синхроніз., надсил. й отрим. дані"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Увага"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Вимкнення фонових даних продовжує час роботи батареї та зменшує використання даних. Деякі програми все ще можуть використовувати передавання фонових даних."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Авто-синхронізація"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Авто-синхронізація"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Програми автоматично синхронізують дані"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Керування обліковими записами"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Синхроніз. ВВІМКНЕНО"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Помилка синхр-ції"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Налаштування резервного копіювання"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Створити резервну копію налаштувань"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронізувати зараз"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Скасувати синхронізацію"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронізувати зараз"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Скасувати синхронізацію"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Торкніться для синхронізації зараз<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Календар"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Вітаємо в Google Sync!"</font>" "\n"Підхід Google до синхронізації даних для надання доступу до ваших контактів, подій та іншого з будь-якого місця, де ви перебуваєте."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Налаштування синхронізації програми"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Дані та синхронізація"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 7c1ccae5..1531879 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"Không bao giờ khi được cắm vào"</item>
     <item msgid="6592896328877671197">"Không bao giờ (sử dụng thêm lượng pin)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Khi màn hình tắt"</item>
+    <item msgid="8137861573803398334">"Không bao giờ khi được cắm"</item>
+    <item msgid="5996547094658157629">"Không (tốn nhiều pin hơn)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Tự động"</item>
     <item msgid="6670588712989942178">"Chỉ 5 GHz"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9d05dcd..b9fe39c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Thông báo cho tôi khi mạng mở khả dụng"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Chính sách ngắt kết nối Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Chỉ định thời điểm sẽ chuyển từ Wi-Fi sang dữ liệu di động"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Chỉ rõ thời điểm ngắt kết nối Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Đã xảy ra sự cố khi thay đổi cài đặt"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Thêm mạng Wi-Fi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mạng Wi-Fi"</string>
@@ -572,7 +573,7 @@
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Không phát âm thanh khi lắp hoặc tháo máy tính bảng khỏi đế"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Không phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
-    <string name="sync_settings" msgid="9186125469300013491">"Tài khoản &amp; đồng bộ hoá"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Tài khoản &amp; đồng bộ hóa"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Thêm hoặc xoá tài khoản và thay đổi cài đặt tài khoản"</string>
     <string name="search_settings" msgid="1910951467596035063">"Tìm kiếm"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Quản lý cài đặt và lịch sử tìm kiếm"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"Mạng"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Địa chỉ MAC của Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Địa chỉ Bluetooth"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"Số sê-ri"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Không rảnh"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Thời gian hoạt động"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Thời gian thức"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"Sử dụng mạng không dây"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Xem vị trí trong ứng dụng (chẳng hạn như Maps) bằng mạng không dây"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Vị trí được xác định bằng mạng Wi-Fi và/hoặc mạng di động"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Vị trí được xác định bằng Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Sử dụng các vệ tinh GPS"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Khi định vị, chính xác đến mức đường phố"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Định vị đến mức đường phố (yêu cầu thêm pin cộng với chế độ xem bầu trời)"</string>
@@ -1371,7 +1370,7 @@
     <string name="background_data_summary" msgid="3630389249212620467">"Ứng dụng có thể đồng bộ hóa, gửi và nhận dữ liệu bất kỳ lúc nào"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Chú ý"</string>
     <string name="background_data_dialog_message" msgid="9155730118215371308">"Vô hiệu hóa dữ liệu nền sẽ kéo dài tuổi thọ pin và giảm việc sử dụng dữ liệu. Một số ứng dụng vẫn có thể sử dụng kết nối dữ liệu nền."</string>
-    <!-- outdated translation 7232356254121075216 -->     <string name="sync_automatically" msgid="7558810110682562376">"Tự động đồng bộ hóa"</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Tự động đồng bộ hóa"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Ứng dụng tự động đồng bộ hóa dữ liệu"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Quản lý tài khoản"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Đồng bộ hóa BẬT"</string>
@@ -1379,13 +1378,13 @@
     <string name="sync_error" msgid="5060969083117872149">"Lỗi đồng bộ hóa"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Sao lưu cài đặt"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Sao lưu cài đặt của tôi"</string>
-    <!-- outdated translation 4438555069848430041 -->     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Đồng bộ hóa ngay bây giờ"</string>
-    <!-- outdated translation 260091941807229790 -->     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Hủy đồng bộ hóa"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Đồng bộ hóa ngay bây giờ"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Hủy đồng bộ hóa"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Chạm để đồng bộ hóa ngay bây giờ<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
-    <!-- outdated translation 2427506589849697841 -->     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <!-- outdated translation 6328872198278573611 -->     <string name="sync_calendar" msgid="9056527206714733735">"Lịch"</string>
-    <!-- outdated translation 6010441370923919977 -->     <string name="sync_contacts" msgid="9174914394377828043">"Danh bạ"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Lịch"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Danh bạ"</string>
     <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Chào mừng bạn đến với Google sync!"</font>" "\n"Một giải pháp đồng bộ hóa dữ liệu của Google cho phép quyền truy cập vào danh bạ, các cuộc hẹn và hơn thế nữa cho dù bạn ở đâu."</string>
     <string name="header_application_sync_settings" msgid="5514539555293976035">"Cài đặt đồng bộ hóa ứng dụng"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dữ liệu &amp; đồng bộ hóa"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index deb7c51..1dff7b0 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"充电时永不休眠"</item>
     <item msgid="6592896328877671197">"从不(增加耗电量)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"屏幕关闭时休眠"</item>
+    <item msgid="8137861573803398334">"充电时永不休眠"</item>
+    <item msgid="5996547094658157629">"从不(增加耗电量)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"自动"</item>
     <item msgid="6670588712989942178">"仅使用 5 GHz 频带"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e0c33e2..9d19068 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -256,7 +256,7 @@
     <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
     <string name="time_picker_title" msgid="483460752287255019">"时间"</string>
     <string name="lock_after_timeout" msgid="940509402681580537">"超时"</string>
-    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"屏幕自动关闭的 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>后锁定屏幕"</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"屏幕自动关闭 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>后锁定屏幕"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在锁定屏幕上显示拥有者信息"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"拥有者信息"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
@@ -412,7 +412,7 @@
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"连接到蓝牙设备"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"个人资料"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="350508394033808532">"重命名设备"</string>
-    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"允许接收文件传输"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"允许传输传入的文件"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已连接到媒体音频"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已连接到手机音频"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已连接到文件传输服务器"</string>
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"附近有开放网络时通知我"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi 断开连接策略"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何时要从 Wi-Fi 切换到手机数据"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"指定何时断开 Wi-Fi 连接"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"更改设置时出现问题"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"添加 Wi-Fi 网络"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 网络"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"网络"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 地址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"蓝牙地址"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"序列号"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"不可用"</string>
     <string name="status_up_time" msgid="7294859476816760399">"开机时间"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"唤醒时间"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"使用无线网络"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"使用无线网络在应用程序(例如 Google 地图)中查看位置"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"通过 Wi-Fi 和/或移动网络确定位置"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"通过 Wi-Fi 确定位置"</string>
     <string name="location_gps" msgid="6296125378829097831">"使用 GPS 卫星"</string>
     <string name="location_street_level" msgid="7456259025474443314">"定位时,精确度设定为街道级别"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"定位到街道级别(需要消耗更多电量以及天气允许)"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index b4cdd06..1984387 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -127,9 +127,11 @@
     <item msgid="1549288661423279207">"插入時絕不"</item>
     <item msgid="6592896328877671197">"永不 (會增加耗電量)"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
-    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"關閉螢幕時進入休眠狀態"</item>
+    <item msgid="8137861573803398334">"連接電源時一律不進入休眠狀態"</item>
+    <item msgid="5996547094658157629">"永不 (會增加耗電量)"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"自動"</item>
     <item msgid="6670588712989942178">"僅限 5 GHz"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c3b3fa3..1033373 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -446,6 +446,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"有開放網路時通知我"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi 中斷連線設定"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何時要從 Wi-Fi 切換到行動數據"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"指定中斷 Wi-Fi 連線的時間"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"變更設定時發生問題"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"新增 Wi-Fi 網路"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 網路"</string>
@@ -644,8 +645,7 @@
     <string name="status_operator" msgid="2274875196954742087">"網路"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 位址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"藍牙位址"</string>
-    <!-- no translation found for status_serial_number (2257111183374628137) -->
-    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"序號"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"無法取得"</string>
     <string name="status_up_time" msgid="7294859476816760399">"開機時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"清醒時間"</string>
@@ -795,8 +795,7 @@
     <string name="location_network_based" msgid="8815705866861993344">"使用無線網路"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"使用無線網路,在應用程式中查詢位置 (例如 Google 地圖)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"根據 Wi-Fi 和/或行動網路判定位置"</string>
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
-    <skip />
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"根據 Wi-Fi 判定位置"</string>
     <string name="location_gps" msgid="6296125378829097831">"使用 GPS 衛星定位"</string>
     <string name="location_street_level" msgid="7456259025474443314">"定位時,將精準度設定為街道等級"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"定位至街道等級 (需要更多電力及天候允許)"</string>
@@ -873,7 +872,7 @@
     <string name="applications_settings" msgid="3736173521008476946">"應用程式"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"管理應用程式,設定快速啟動鍵"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"應用程式設定"</string>
-    <string name="install_applications" msgid="4872012136210802181">"未知的來源"</string>
+    <string name="install_applications" msgid="4872012136210802181">"不明的來源"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"允許安裝非 Market 應用程式"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"來歷不明的應用程式可能會損害您的平板電腦及個人資料,如因使用這些應用程式導致平板電腦受損或資料遺失,請自行承擔責任。"</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"未知來源的應用程式可能會損害您的手機及個人資訊。如使用這些應用程式而造成手機受損或資料遺失,您必須自行承擔責任。"</string>