diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 06868c7..e46ce09 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi en 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Geen"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (Grafika)"</item>
+    <item msgid="1340692776955662664">"Belstapel op glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen agtergrondprosesse"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 694e32d..85b46de 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Kies skermslot"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Kies rugsteunslot"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skermslot"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Statuslegstuk"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Ander legstuk"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Voeg legstuk by"</string>
     <string name="widget_none" msgid="2708702293215501854">"Geen"</string>
     <string name="widget_default" msgid="8269383575996003796">"Horlosie"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Verander slotskerm"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Voeg netwerk by"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerke"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-drukknoppie"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Meer opsies"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN-invoering"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skandeer"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Nog"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Outomatiese opstelling (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Om opstelling te voltooi, moet jou tablet toegang hê tot Wi-Fi. Na opstelling kan jy wissel tussen mobiele data en Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Wys gevorderde opsies"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskermde opstelling"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS begin..."</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Muurpapier"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Kies muurpapier uit"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Slaapmodus"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdroom"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wanneer dit gedok is of slaap en laai"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enige een"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Terwyl laai"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Terwyl dit gedok is"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Af"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Om te beheer wat gebeur wanneer die foon gedok is en/of slaap, skakel slaapmodus aan."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Wanneer om te slaap"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Slaap nou"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wanneer om Dagdroom te gebruik"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Begin nou"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fontgrootte"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Geen spore is tans geaktiveer nie"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spore tans geaktiveer"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle spore is tans geaktiveer"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiveer OpenGL-spore"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Wys uitleg se grense"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Wys snitgrense, kantlyne, ens."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Wys CPU-verbruik"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e248176..3cc596f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ማሳያ ቆልፍ ምረጥ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"ምትኬ ቆላፊ ምረጥ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ ተቆልፏል"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"የሁኔታ መግብር"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"ሌላ መግብር"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"ንዑስ ፕሮግራም አክል"</string>
     <string name="widget_none" msgid="2708702293215501854">"ምንም የለም"</string>
     <string name="widget_default" msgid="8269383575996003796">"ሰዓት"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ማሳያ ቆልፍን ለውጥ"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"ሌላ አውታረ መረብ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ተጨማሪ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"በራስ ሰር ማወቀር (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"መዋቀሩን ለማጠናቀቅ ጡባዊዎ የWi-Fi መዳረሻ ያስፈልገዋል። ከተዋቀረ በኋላ በተንቀሳቃሽ ስልክ ውሂብ እና Wi-Fi መካከል መቀያየር ይችላሉ።"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"የላቁ አማራጮችን አሳይ"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"በWi-Fi የተጠበቀ መዋቅር"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS በመጀመር ላይ…"</string>
@@ -722,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"ልጣፍ"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ልጣፍ ምረጥ ከ"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"የእንቅልፍ ሁነታ"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"ሲተከል ወይም ሲተኛ እና ባትሪ እየሞላ ሳለ"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"ማናቸውም"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"ባትሪ በመሙላት ላይ ሳለ"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ተተክሎ ሳለ"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ጠፍቷል"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"ስልኩ ሲተከል እና/ወይም ሲተኛ ምን እንደሚከሰት ለመቆጣጠር የእንቅልፍ ሁነታን ያብሩ።"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"መቼ እንደሚተኛ"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"አሁን ተኛ"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"መቼ በቀን ማለም እንዳለበት"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"አሁን ጀምር"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ቅንብሮች"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
     <string name="title_font_size" msgid="4405544325522105222">"የቁምፊ መጠን"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5809215..303039f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"اختيار قفل الشاشة"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"اختر قفلاً للنسخ الاحتياطي"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"أداة الحالة"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"أداة أخرى"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"إضافة أداة"</string>
     <string name="widget_none" msgid="2708702293215501854">"لا شيء"</string>
     <string name="widget_default" msgid="8269383575996003796">"الساعة"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغيير تأمين الشاشة"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"شبكة أخرى..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"الإعداد التلقائي (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"لإكمال الإعداد، يحتاج جهازك اللوحي إلى إمكانية الدخول إلى Wi-Fi. وبعد الإعداد، ستتمكن من التبديل بين بيانات الجوال وWi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"عرض الخيارات المتقدمة"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"إعداد Wi-Fi المحمي"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"جارٍ بدء WPS…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"الخلفية"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"اختيار خلفية من"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"وضع السكون"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"حلم اليقظة"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"عند الإرسال أو السكون والشحن"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"أي الخيارين"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"أثناء الشحن"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"أثناء الإرساء"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"إيقاف"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"للتحكم في ما يحدث عندما يتم إرساء الهاتف و/أو عند السكون، شغل وضع السكون."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"وقت السكون"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"السكون الآن"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"وقت تشغيل خلفيات أحلام اليقظة التفاعلية"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"البدء الآن"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"إعدادات"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
     <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ef391de..b61c22d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Выберыце спосаб блак. экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Блакав. рэз. капіяв."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блакоўка экрана"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Стан вiджэта"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Іншы віджэт"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Дадаць віджэт"</string>
     <string name="widget_none" msgid="2708702293215501854">"Няма"</string>
     <string name="widget_default" msgid="8269383575996003796">"Гадзіннік"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змена блакавання экрана"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Іншая сетка..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Дадатковая інфармацыя"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аўтаматычная ўсталёўка (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Для завяршэння ўсталёўкі планшэта неабходны доступ да Wi-Fi. Пасля ўсталёўкі вы можаце пераключацца паміж мабільнай перадачай дадзеных і Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Паказаць дадатковыя параметры"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Абароненая ўсталёўка Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запускаецца WPS..."</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Пасля бяздзейнасці: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Шпалеры"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Выбраць шпалеры ў"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Рэжым сну"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Мроi"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Калі падключаны, у рэжыме сну цi зараджаецца"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Або"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Падчас зарадкі"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Пакуль падключаны"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Адключана"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Каб кантраляваць тое, што адбываецца, калі тэлефон падкючаны або ў стане сну, уключыце \"Мары\"."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Калі спаць"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Засыпай"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Калі трэба марыць"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Пачаць"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Налады"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Памер шрыфта"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index ebe92df..f203510 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1 920 x 1 080 xhdpi"</item>
     <item msgid="3646519549495410112">"1 280 x 720 tvdpi и 1 920 x 1 080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Без"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (Графика)"</item>
+    <item msgid="1340692776955662664">"Извикване на стека при glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартно ограничение"</item>
     <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 24d7d30..7169ed2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закл. на екрана: Избор"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Резервно заключване"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заключване на екрана"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Приспособл. за съст."</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Друго приспособление"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"+ приспособление"</string>
     <string name="widget_none" msgid="2708702293215501854">"Няма"</string>
     <string name="widget_default" msgid="8269383575996003796">"Часовник"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промяна на заключването"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавяне на мрежа"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мрежи"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Бутон за WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Още опции"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Въвеждане на WPS ПИН"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканиране"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Още"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авт. настройка (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"За да завърши настройката, таблетът ви се нуждае от достъп до Wi-Fi. След това можете да превключвате между мобилни данни и Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показване на разширените опции"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Защитена настройка на Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS се стартира…"</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Тапет"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избор на тапет от"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Спящ режим"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"При свързване с докинг станция или при спящ режим и зареждане"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"И в двата случая"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"При зареждане"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"При свързване с докинг станция"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Изкл."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"За да контролирате какво се случва, когато телефонът е свързан с докинг станция и/или е в спящ режим, включете спящия режим."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Време за спящ режим"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"В спящ режим сега"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Време за мечти"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Стартиране сега"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
@@ -1656,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Понастоящем няма активирани трасирания"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Понастоящем са активирани <xliff:g id="NUM">%1$d</xliff:g> трасирания"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Понастоящем всички трасирания са активирани"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Трасирания на OpenGL: Акт."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Граници на оформлението"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показв. на границите на изрязване, полетата и др."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Употреба на процесора"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 9dd6183..f7536ba 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi i 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Cap"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (gràfics)"</item>
+    <item msgid="1340692776955662664">"Pila de trucades de glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límit estàndard"</item>
     <item msgid="4071574792028999443">"Sense processos en segon pla"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 35e00e5..8aaa34c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria bloq. de pantalla"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Tria bloq. còpia seg."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueig de pantalla"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget d\'estat"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Un altre widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Addició d\'un widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Cap"</string>
     <string name="widget_default" msgid="8269383575996003796">"Rellotge"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Canvi pantalla bloq."</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Afegeix una xarxa"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Xarxes Wi-fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botó de pulsació de WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Més opcions"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"PIN de WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi directe"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Cerca"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Una altra xarxa…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Més"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automàtica (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Per completar la configuració, la tauleta necessita accés a la Wi-Fi. En acabat, podràs canviar entre les dades mòbils i la Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra les opcions avançades"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuració protegida de Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"S\'està iniciant WPS…"</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona fons de pantalla de"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Mode de repòs"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Fantasia"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quan el dispositiu estigui en un connector o inactiu i carregant-se"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Una de les dues"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Mentre es carrega"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quan el dispositiu estigui en un connector"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivat"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Per controlar què passa quan el telèfon està connectat o en repòs, activa el mode de repòs."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Quan entri en mode de repòs"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Entra en mode de repòs"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quan s\'ha d\'activar l\'estalvi de pantalla"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comença ara mateix"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuració"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Actualment no hi ha seguiments activats"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces activades actualment"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Totes les traces activades actualment"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa traces d\'OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostra límits de disseny"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra els límits de clips, els marges, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra l\'ús de la CPU"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 452330b..67111d3 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi a 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Žádné"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (grafika)"</item>
+    <item msgid="1340692776955662664">"Zásobník volání funkce glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardní limit"</item>
     <item msgid="4071574792028999443">"Procesy na pozadí deaktivovány"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 18835a1..17f528e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vybrat zámek obrazovky"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Výběr záložního zámku"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámek obrazovky"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Stavový widget"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Jiný widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Přidat widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Žádné"</string>
     <string name="widget_default" msgid="8269383575996003796">"Hodiny"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Změna zámku obrazovky"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Přidat síť"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sítě WiFi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačítko WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Další možnosti"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadání kódu WPS PIN"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Přímé přip. Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhledávání"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Jiná síť…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Další"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. nastavení (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"K dokončení nastavení tablet potřebuje přístup k síti Wi-Fi. Po nastavení můžete přepínat mezi mobilním datovým připojením a sítí Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobrazit pokročilé možnosti"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Chráněné nastavení Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spouštění WPS…"</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrat tapetu:"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Režim spánku"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Spořič obrazovky"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Při vložení do doku nebo při nabíjení v režimu spánku"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"V obou případech"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Při nabíjení"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Při vložení do doku"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vyp."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Chcete-li nastavit, co se stane, když je telefon vložen do doku nebo je v režimu spánku, zapněte režim spánku."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kdy spát"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Spát nyní"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdy spustit spořič obrazovky"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začít"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavení"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Žádná sledování nejsou momentálně povolena."</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Momentálně povolená sledování: <xliff:g id="NUM">%1$d</xliff:g>"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Všechna sledování jsou momentálně povolena."</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povolit trasování OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobrazit ohraničení"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobrazit u klipu ohraničení, okraje atd."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobrazit využití CPU"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index dc92e4c..c3345b6 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280 x 720 tvdpi og 1920 x 1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ingen"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (grafik)"</item>
+    <item msgid="1340692776955662664">"Kaldestak på glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgrænse"</item>
     <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 94cd986..5eebb1d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vælg skærmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vælg backuplås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skærmlås"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Statuswidget"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Anden widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Tilføj widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Ingen"</string>
     <string name="widget_default" msgid="8269383575996003796">"Ur"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Skift skærmlås"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Tilføj netværk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netværk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-trykknap"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Flere valgmuligheder"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Angiv WPS-pinkode"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Andre netværk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mere"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Din tablet skal have adgang til Wi-Fi for at kunne fuldføre konfigurationen. Efter konfigurationen kan du skifte mellem mobildata og Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avancerede valgmuligheder"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskyttet konfiguration"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS..."</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vælg baggrund fra"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Dvaletilstand"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Når enheden er tilsluttet en dockingstation eller i dvale og i færd med at oplade"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Begge dele"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under opladning"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheden er tilsluttet en dockingstation"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Fra"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Hvis du vil kontrollere, hvad der sker, når telefonen tilsluttes en dockingstation og/eller går i dvale, skal du slå Dvaletilstand til."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Hvornår dvaletilstand skal slås til"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Gå i dvale nu"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Hvornår der skal dagdrømmes"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nu"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Indstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
@@ -1656,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Der er i øjeblikket ingen aktiverede spor"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g>"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle spor er i øjeblikket aktiveret"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivér OpenGL-spor"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis layoutgrænser"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Vis grænser for klip, margener osv."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-forbrug"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0cbcabc..e6d230c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Display-Sperre wählen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Ersatzsperre wählen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Display-Sperre"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Status-Widget"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Andere Widgets"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Widget hinzufügen"</string>
     <string name="widget_none" msgid="2708702293215501854">"Keine"</string>
     <string name="widget_default" msgid="8269383575996003796">"Uhr"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Display-Sperre ändern"</string>
@@ -723,15 +722,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Ruhemodus"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Bei angedocktem Gerät oder im Ruhezustand beim Aufladen"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Beides"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Während des Ladevorgangs"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Bei angedocktem Gerät"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Aus"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Um festzulegen, was geschieht, wenn das Telefon angedockt und/oder im Ruhezustand ist, aktivieren Sie den Ruhemodus."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Ruhemodus aktivieren"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Ruhemodus ein"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Daydreams starten"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Jetzt starten"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Einstellungen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 71bf155..8bc92b6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Επιλογή κλειδ. οθόνης"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Επιλ. εφεδρ. κλειδώμ."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδωμα οθόνης"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Το γραφικό στοιχείο κατάστασης"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Άλλο γραφικό στοιχείο"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Προσθήκη γραφ. στοιχ."</string>
     <string name="widget_none" msgid="2708702293215501854">"Κανένας"</string>
     <string name="widget_default" msgid="8269383575996003796">"Ρολόι"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Αλλαγή κλειδώματος οθ."</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Άλλο δίκτυο…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Περισσότερα"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Αυτόματη ρύθμιση (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Για να ολοκληρώσετε τη ρύθμιση, το tablet σας χρειάζεται πρόσβαση σε δίκτυο Wi-Fi. Μετά τη ρύθμιση, μπορείτε να κάνετε εναλλαγή μεταξύ δεδομένων κινητής τηλεφωνίας και δικτύου Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Εμφάνιση σύνθετων επιλογών"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ρύθμιση προστατευόμενου Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Έναρξη WPS…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ταπετσαρία"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Επιλογή ταπετσαρίας από"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Κατάσταση αναστολής λειτουργίας"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Κατά τη σύνδεση ή κατά την κατάσταση αδράνειας και τη φόρτιση"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Είτε"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Κατά τη φόρτιση"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Κατά τη σύνδεση"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Απενεργοποίηση"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Για να ελέγξετε τι συμβαίνει όταν το τηλέφωνο είναι συνδεδεμένο και/ή σε κατάσταση αδράνειας, ενεργοποιήστε την κατάσταση αναστολής λειτουργίας."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Ρύθμιση αναστολής λειτουργίας"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Ενεργοποίηση αναστολής λειτουργίας"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Πότε να χρησιμοποιείται η εφαρμογή Daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Έναρξη τώρα"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ρυθμίσεις"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1a435e7..b0a533f 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Choose backup lock"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Status widget"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Other widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Add widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"None"</string>
     <string name="widget_default" msgid="8269383575996003796">"Clock"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Change lock screen"</string>
@@ -562,8 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
-    <!-- no translation found for wifi_required_info_text (9014073093293520112) -->
-    <skip/>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"To complete setup, your tablet needs access to Wi-Fi. After setup, you can switch between mobile data and Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Show advanced options"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starting WPS…"</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Choose wallpaper from"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Sleep Mode"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"When docked or asleep and charging"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Either"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"While charging"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"While docked"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Off"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"To control what happens when the phone is docked and/or sleeping, turn Sleep Mode on."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"When to sleep"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Sleep now"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"When to daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start now"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index cedc0fe..85b471f 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280 x 720 tvdpi y 1920 x 1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ninguna"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (gráficos)"</item>
+    <item msgid="1340692776955662664">"Pila de llamadas en glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"No hay procesos de fondo."</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 04577c4..318ac81 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -301,11 +301,11 @@
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar parpadeo durante desbloqueo"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de la suspensión"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar datos de propietario en pantalla de bloqueo"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar datos de propietario en pantalla bloqueada"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Datos de propietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
-    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Escribe el texto para la pantalla de bloqueo."</string>
-    <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar datos de usuario en la pantalla de bloqueo"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ingresa el texto para la pantalla bloqueada."</string>
+    <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar datos de usuario en pantalla bloqueada"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Datos de usuario"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acceso a la ubicación"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
@@ -341,11 +341,10 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo pant."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget de estado"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Otro widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Agregar widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Ninguno"</string>
     <string name="widget_default" msgid="8269383575996003796">"Reloj"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. de bloq."</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. bloqueada"</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_backup_info_summary" msgid="108524727803788172">"Si el desbloqueo facial no te reconoce, ¿cómo quieres desbloquear la pantalla?"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Agregar red"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pulsador WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Más opciones"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Ingreso PIN WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Necesitas conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás alternar entre Wi-Fi y conexión de datos móviles."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar las opciones avanzadas"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuración Wi-Fi protegida"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando la WPS…"</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elegir fondo de pantalla de"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Modo de suspensión"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando esté conectado o cuando se encuentre inactivo y cargándose"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Cualquiera de las dos opciones"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando esté conectado"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Apagado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar qué sucede cuando el dispositivo está conectado o inactivo, activa el modo de suspensión."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Cuándo activar el modo de suspensión"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Activar modo de suspensión ahora"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activar el protector de pantalla"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comenzar ahora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuración"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
@@ -1315,7 +1314,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a la accesibilidad"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Encendido"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivada"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes activar las funciones de accesibilidad rápidamente en dos pasos."\n\n"Paso 1: mantén presionado el botón de encendido hasta que oigas un sonido o notes una vibración."\n\n"Paso 2: mantén la pantalla presionada con dos dedos hasta que oigas una confirmación."\n\n"Si el dispositivo tiene varios usuarios, este acceso directo en la pantalla de bloqueo permite habilitar la accesibilidad de forma temporal hasta que el dispositivo se desbloquea."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes activar las funciones de accesibilidad rápidamente en dos pasos."\n\n"Paso 1: mantén presionado el botón de encendido hasta que oigas un sonido o notes una vibración."\n\n"Paso 2: mantén la pantalla presionada con dos dedos hasta que oigas una confirmación."\n\n"Si el dispositivo tiene varios usuarios, este acceso directo en la pantalla bloqueada permite habilitar la accesibilidad de forma temporal hasta que el dispositivo se desbloquea."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar automáticamente la ampliación de pantalla"</string>
@@ -1656,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"No se activó ningún seguimiento."</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Se activaron <xliff:g id="NUM">%1$d</xliff:g> seguimientos."</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Se activaron todos los seguimientos."</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Seguimientos de OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar márgenes, límites de clips, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar el uso de CPU"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index be25442..f8bff5e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo de pantalla"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget de estado"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Otro widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Añadir widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Ninguno"</string>
     <string name="widget_default" msgid="8269383575996003796">"Reloj"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pantalla de bloqueo"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona una categoría"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Modo de suspensión"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Salvapantallas"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando el dispositivo esté en un conector o inactivo y cargando"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté en un conector"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar lo que ocurre cuando el teléfono está conectado o inactivo, debes activar el modo de suspensión."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Cuándo activar el modo de suspensión"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Activar suspensión"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activar el salvapantallas"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar ahora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ajustes"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
@@ -1655,7 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"No hay seguimientos habilitados en este momento."</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> seguimientos habilitados en este momento"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Todos los seguimientos habilitados"</string>
-    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Habilitar seguimientos OpenGL"</string>
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Habilitar seguimiento OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de vídeo, márgenes, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar uso de la CPU"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 82c36bd..09c8cc5 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280 x 720 tvdpi, 1920 x 1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Puudub"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (graafika)"</item>
+    <item msgid="1340692776955662664">"Helistamise virn glGetErrori kohta"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardpiir"</item>
     <item msgid="4071574792028999443">"Taustaprotsessideta"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 46eabc4..c34656c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekraaniluku valimine"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valige varukoopia lukk"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekraanilukk"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Oleku vidin"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Muu vidin"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Vidina lisamine"</string>
     <string name="widget_none" msgid="2708702293215501854">"Puudub"</string>
     <string name="widget_default" msgid="8269383575996003796">"Kell"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekraaniluku muutmine"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Võrgu lisamine"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"WiFi-võrgud"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-nupp"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Rohkem valikuid"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i PIN-koodi kirje"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Otsene WiFi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu võrk ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Rohkem"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaatseadistus (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Seadistuse lõpule viimiseks vajab teie tahvelarvuti WiFi-ühendust. Pärast seadistust saate vahetada mobiilse andmeside ja WiFi vahel."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Kuva täpsemad valikud"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kaitstud WiFi seadistamine"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS-i käivitamine …"</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustapilt"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Unerežiim"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Unerežiim"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kui on dokitud või puhkerežiimis ja laeb"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kui on dokitud või puhkerežiimis"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Laadimise ajal"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kui on dokitud"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Välja"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Kui soovite juhtida, mis juhtub telefoni dokkimisel ja/või puhkerežiimi lülitamisel, siis lülitage sisse unerežiim."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Unerežiimi ajal"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Nüüd unerežiimi"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Millal lülitada sisse unerežiim?"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Alusta kohe"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Seaded"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Praegu pole lubatud ükski jälgimine"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> jälgimist on praegu lubatud"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Kõik jälgimised on praegu lubatud"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Luba OpenGL-i jälgimine"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Näita paigutuse piire"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Kuva klipi piirid, veerised jms"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-kasutuse kuvamine"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 39be9b7..50b2d1d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"قفل صفحهٔ نمایش را انتخاب کنید"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"قفل پشتیبان را انتخاب کنید"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"قفل صفحه"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"ابزارک وضعیت"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"ابزارک‌ دیگر"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"افزودن ابزارک"</string>
     <string name="widget_none" msgid="2708702293215501854">"هیچکدام"</string>
     <string name="widget_default" msgid="8269383575996003796">"ساعت"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغییر قفل صفحه"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"شبکه‌ای دیگر…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"بیشتر"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"تنظیم خودکار (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"برای تکمیل نصب، رایانه لوحی شما باید به Wi-Fi دسترسی پیدا کند. بعد از نصب، می‌توانید بین داده‌های تلفن همراه و Wi-Fi جابجا شوید."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"نمایش گزینه‌های پیشرفته"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"نصب Wi-Fi حفاظت شده"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"راه‌اندازی WPS…"</string>
@@ -722,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"پس از گذشت <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> از غیر فعال بودن"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"تصویر زمینه"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"انتخاب تصویر زمینه از"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"حالت خواب"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"هنگام قرار گرفتن در جایگاه یا خواب و شارژ شدن"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"هرکدام از این موارد"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"هنگام شارژ"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"هنگامی که در جایگاه قرار می‌گیرد"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"خاموش"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"برای کنترل آنچه که وقتی تلفن را در جایگاه خود متصل می‌ٔکنید روی می‌دهد و/یا خواب، حالت خواب را روشن کنید."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"هنگام خواب"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"اکنون خواب"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"زمان رویاپردازی"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"اکنون شروع شود"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"تنظیمات"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
     <string name="title_font_size" msgid="4405544325522105222">"اندازهٔ قلم"</string>
@@ -1145,7 +1145,7 @@
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"برنامه داخلی غیرفعال شود؟"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"در صورت غیر فعال کردن یک برنامه داخلی، سایر برنامه‌ها ممکن است عملکرد نادرستی از خود نشان دهند."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"حذف داده‌ها و غیر فعال کردن برنامه؟"</string>
-    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"در صورتی که یک برنامه داخلی را غیرفعال کنید، سایر برنامه‌ها ممکن است عملکرد نادرستی از خود نشان دهند. داده‌های شما همچنین حذف خواهند شد."</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"در صورتی که یک برنامه داخلی را غیرفعال کنید، ممکن است برنامه‌های دیگری هم دچار مشکل شوند. داده‌های شما نیز حذف خواهند شد."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"خاموش کردن اعلان‌ها؟"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"اگر اعلانی را برای این برنامه خاموش کنید، ممکن است هشدارها و به‌روزرسانی‌های مهم را از دست بدهید."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استفاده از حافظه"</string>
@@ -1662,7 +1662,7 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"همپوشانی صفحهٔ نمایش میزان استفاده از CPU فعلی"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"اجبار به تفسیر و اجرای GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"استفاده اجباری از GPU برای طراحی دوم"</string>
-    <string name="force_msaa" msgid="7920323238677284387">"اجرای 4x MSAA"</string>
+    <string name="force_msaa" msgid="7920323238677284387">"تحمیل 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"فعال کردن 4X MSAA در برنامه‌های OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"اجرای GPU نمایه"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"اندازه‌گیری زمان اجرا در adb shell dumpsys gfxinfo"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 30fd0c6..5729a3e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse ruudunlukitus"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valitse varalukko"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ruudun lukitus"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Tila-widget"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Muu widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Lisää widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Ei mitään"</string>
     <string name="widget_default" msgid="8269383575996003796">"Kello"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Vaihda ruudunlukitusta"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu verkko..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lisää"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaattiset aset. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Asetuksien viimeistelyyn vaaditaan wifi-yhteys. Asetuksien määrittämisen jälkeen voit käyttää mobiiliverkkoyhteyttä tai wifi-yhteyttä."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Näytä lisäasetukset"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Suojatut wifi-asetukset"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Käynnistetään WPS:ää..."</string>
@@ -722,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Virransäästötila"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Telakoituna tai virransäästötilassa ja ladattaessa"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Joko"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Latauksen aikana"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Telakoituna"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Pois käytöstä"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Jos haluat hallita puhelimen toimintaa telakoituna ja/tai lepotilassa, ota virransäästötila käyttöön."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Virransäästötilaan siirtyminen"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Virransäästötilaan"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Milloin unelmoidaan"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Aloita nyt"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Asetukset"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index f83d1ab..0e963b3 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1 920 x 1 080 xdpi"</item>
     <item msgid="3646519549495410112">"1 280x720 tvdpi et 1 920x1 080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Aucun"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (graphismes)"</item>
+    <item msgid="1340692776955662664">"Appeler une pile sur glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Aucun processus en arrière-plan"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 16336f3..cd116f3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Sélect. verr. écran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Verrouillage secondaire"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget d\'état"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Autre widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Ajouter un widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Aucun"</string>
     <string name="widget_default" msgid="8269383575996003796">"Horloge"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Modifier écran verr."</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Ajouter un réseau"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Réseaux Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Bouton commande WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Autres options"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Saisie code PIN WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Rechercher"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Autre réseau…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Plus"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuration auto (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Pour terminer la configuration de votre tablette, vous devez disposer d'un accès Wi-Fi. Une fois la configuration effectuée, vous pouvez choisir d'utiliser un forfait de données pour mobile ou un réseau Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Pour terminer la configuration de votre tablette, vous devez disposer d\'un accès Wi-Fi. Une fois la configuration effectuée, vous pouvez choisir d\'utiliser un forfait de données pour mobile ou un réseau Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Afficher les options avancées"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuration Wi-Fi protégée"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Démarrage de la configuration WPS…"</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner fond d\'écran dans"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Écran de veille interactif"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Écran de veille"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Lorsque l\'appareil est installé sur la station d\'accueil ou lorsqu\'il est en veille et en charge"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Les deux"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pendant la charge"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Sur la station d\'accueil"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Désactivé"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Pour contrôler le comportement du téléphone lorsqu\'il se trouve sur une station d\'accueil et/ou lorsqu\'il est en veille, activez l\'écran de veille interactif."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Activer l\'écran de veille interactif"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Mettre en veille"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Activer l\'écran de veille interactif"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Commencer"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Paramètres"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Aucune trace n\'est activée actuellement."</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces activées actuellement"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Toutes les traces sont actuellement activées."</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activer les traces OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 2569a76..c6c7aab 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi और 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"कोई नहीं"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (ग्राफ़िक)"</item>
+    <item msgid="1340692776955662664">"glGetError पर स्टैक कॉल करें"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"मानक सीमा"</item>
     <item msgid="4071574792028999443">"कोई पृष्ठभूमि प्रक्रियाएं नहीं"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bf3dbf6..ba66849 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्‍क्रीन लॉक चुनें"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"बैकअप लॉक चुनें"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"स्थिति विजेट"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"अन्य विजेट"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"विजेट जोड़ें"</string>
     <string name="widget_none" msgid="2708702293215501854">"कुछ नहीं"</string>
     <string name="widget_default" msgid="8269383575996003796">"घड़ी"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"लॉक स्‍क्रीन बदलें"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोड़ें"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi नेटवर्क"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटन"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"अधिक विकल्प"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi डायरेक्ट"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"अन्‍य नेटवर्क…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"सेटअप पूर्ण करने के लिए, आपके टेबलेट को Wi-Fi का उपयोग करना होगा. सेटअप के बाद, आप मोबाइल डेटा और Wi-Fi के बीच स्विच कर सकते हैं."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"उन्नत विकल्प दिखाएं"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi सुरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"निष्क्रिय मोड"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"डॉक किए हुए या निष्क्रिय रहने और चार्ज करने पर"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"कोई एक"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"चार्ज करते समय"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"जब डॉक किया हुआ हो"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बंद"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"फ़ोन के डॉक किए होने पर और/या निष्क्रिय होने पर होने वाली कार्यवाही नियंत्रित करने के लिए निष्क्रिय मोड को चालू करें."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"कब निष्क्रिय करना है"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"अभी निष्क्रिय करें"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"daydream कब करें"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"अब प्रारंभ करें"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"स्‍वचालित चमक"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फ़ॉन्ट आकार"</string>
@@ -1657,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"वर्तमान में कोई ट्रेस सक्षम नहीं है"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"वर्तमान में <xliff:g id="NUM">%1$d</xliff:g> ट्रेस सक्षम हैं"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"वर्तमान में सभी ट्रेस सक्षम हैं"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL चिह्न सक्षम करें"</string>
     <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमाएं दिखाएं"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"क्लिप सीमाएं, मार्जिन, आदि दिखाएं."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU उपयोग दिखाएं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 479d994..6d518e7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberite zaključavanje zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Odabir sig. zaključ."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje zaslona"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget statusa"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Drugi widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Dodavanje widgeta"</string>
     <string name="widget_none" msgid="2708702293215501854">"Ništa"</string>
     <string name="widget_default" msgid="8269383575996003796">"Sat"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Promjena zaklj. zasl."</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ostale mreže…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Više"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. postavljanje (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Da bi se postavljanje dovršilo, vaše tabletno računalo treba pristupiti Wi-Fi mreži. Nakon postavljanja možete izmjenjivati mobilnu podatkovnu vezu i Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaži napredne opcije"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Postavljanje zaštićene mreže Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pokretanje WPS-a..."</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Stanje mirovanja"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Sanjarenje"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kada je uređaj na priključnoj stanici ili kada miruje i puni se"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ili"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijekom punjenja"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kada je na priključnoj stanici"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Da biste kontrolirali događaje dok je telefon na priključnoj stanici i/ili dok miruje, uključite značajku Mirovanja."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kada mirovati"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Miruj sad"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada sanjariti"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Započni sad"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 3128e57..1f4bdaa 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi és 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Semelyik"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (grafika)"</item>
+    <item msgid="1340692776955662664">"Verem meghívása glGetError esetén"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Normál korlátozás"</item>
     <item msgid="4071574792028999443">"Nincsenek háttérfolyamatok"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 17bb0ce..8a44f7c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Képernyőzár választása"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Biztonsági zárolás"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő zárolása"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Állapotmodul"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Más modul"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Modul felvétele"</string>
     <string name="widget_none" msgid="2708702293215501854">"Nincs"</string>
     <string name="widget_default" msgid="8269383575996003796">"Óra"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Képernyőzár mód."</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Hálózat hozzáadása"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi hálózatok"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS gomb"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"További lehetőségek"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kód megadása"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Keresés"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Másik hálózat..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Egyebek"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. beállítás (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"A telepítés befejezéséhez a táblagépnek Wi-Fi hálózatra van szüksége. A beállítás után válthat a mobil adatforgalom és a Wi-Fi között."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Speciális beállítások megjelenítése"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS indítása..."</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Válasszon tapétát innen:"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Alvó üzemmód"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Álmodozás"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Dokkolt vagy alvó állapotban, töltés közben"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Mindegy"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Töltés közben"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dokkolt állapotban"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Ki"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ha szeretné beállítani, hogy mi történjen a telefon dokkolt és/vagy alvó állapotában, kapcsolja be az Alvó üzemmódot."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Mikor lépjen alvó üzemmódba"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Alvó mód"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Álmodozás ideje"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Indítás most"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Beállítások"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Jelenleg nincs engedélyezett nyomkövetés."</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Jelenleg <xliff:g id="NUM">%1$d</xliff:g> nyomkövetés engedélyezett."</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Jelenleg minden nyomkövetés engedélyezve van."</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL nyomon követése"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Elrendezéshatár mutatása"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Kliphatárok, margók stb. megjelenítése."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-használat mutatása"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 48704d1..6bbdd50 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih gembok cadangan"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Gembok layar"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget status"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Widget lainnya"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Tambahkan widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Tidak ada"</string>
     <string name="widget_default" msgid="8269383575996003796">"Jam"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ubah layar gembok"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Jaringan lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Penyiapan otomatis (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Untuk menyelesaikan penyiapan, tablet Anda perlu mengakses Wi-Fi. Setelah penyiapan, Anda dapat beralih antara data seluler dan Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tampilkan opsi lanjutan"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Penyiapan Wi-Fi yang Dilindungi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulai WPS..."</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Mode Tidur"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Lamunan"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Saat di dok atau tidur dan mengisi baterai"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Salah satu"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi daya"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Selagi di dok"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Untuk mengontrol apa yang terjadi saat ponsel dipasang ke dok dan/atau sedang tidur, nyalakan Mode Mimpi."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Saat akan tidur"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Tidur Sekarang"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Waktu melamun"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulai sekarang"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setelan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8eb6d2f..a95b96a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -43,7 +43,7 @@
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Fuori servizio"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Solo chiamate di emergenza"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Segnale radio disattivato"</string>
-    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming..."</string>
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Non roaming"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Inattivo"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Chiamata in corso"</string>
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Scegli blocco schermo"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Scegli blocco di backup"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocco schermo"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget Stato"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Altro widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Aggiungi widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Nessuno"</string>
     <string name="widget_default" msgid="8269383575996003796">"Orologio"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambia blocco schermo"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Altra rete…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Altro"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configurazione auto (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Per poter completare la configurazione, il tablet deve poter accedere a una rete Wi-Fi. Dopo la configurazione potrai passare dalla rete di dati mobili alla rete Wi-Fi e viceversa."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra opzioni avanzate"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Impostazione protetta Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Avvvio WPS..."</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Scegli sfondo da"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Modalità di sospensione"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando inserito nel dock o in stand-by e ricarica"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"O"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Entrambi i casi"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la ricarica"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Disattivato"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Per stabilire che cosa accade quando il telefono è inserito nel dock e/o in stand-by, attiva la Modalità di sospensione."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Quando attivare la Modalità di sospensione"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Sospendi ora"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando sognare a occhi aperti"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Inizia subito"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Impostazioni"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
@@ -789,7 +788,7 @@
     <string name="status_data_state" msgid="5503181397066522950">"Stato rete cellulare"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stato servizio"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensità segnale"</string>
-    <string name="status_roaming" msgid="2638800467430913403">"Roaming.."</string>
+    <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 945499e..b323d32 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"בחירת נעילת מסך"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"בחר נעילת גיבוי"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"נעילת מסך"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget סטטוס"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Widget אחר"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"הוסף Widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"ללא"</string>
     <string name="widget_default" msgid="8269383575996003796">"שעון"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"שינוי נעילת מסך"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"רשת אחרת..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"התקנה אוטומטית (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"כדי להשלים את ההתקנה, הטאבלט צריך גישה ל-Wi-Fi. לאחר ההתקנה, תוכל לעבור בין רשת נתונים לנייד ובין Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"הצג אפשרויות מתקדמות"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"התקנה מוגנת של Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"מפעיל WPS..."</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"טפט"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"בחר טפט מ-"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"מצב שינה"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"בזמן עגינה או בזמן שינה כשמתבצעת טעינה"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"בשני המצבים"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"במהלך טעינה"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"בזמן עגינה"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"כבוי"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את מצב השינה."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"מתי לעבור למצב שינה"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"עבור לשינה עכשיו"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"מתי יש לעבור למצב Daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"התחל כעת"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"הגדרות"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index b6f6ed7..2c2e94f 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpiと1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"なし"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace（画像）"</item>
+    <item msgid="1340692776955662664">"glGetErrorでのスタック呼び出し"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準の上限"</item>
     <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 90d7c30..de5cddd 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -343,8 +343,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"画面ロックを選択"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"バックアップのロックの選択"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"画面のロック"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"ステータスウィジェット"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"その他のウィジェット"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"ウィジェットを追加"</string>
     <string name="widget_none" msgid="2708702293215501854">"なし"</string>
     <string name="widget_default" msgid="8269383575996003796">"時計"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ロック解除方法を変更する"</string>
@@ -551,8 +550,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"ネットワークを追加"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fiネットワーク"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPSプッシュボタン"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"その他のオプション"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN入力"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"スキャン"</string>
@@ -565,7 +563,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"他のネットワーク…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"その他"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定（WPS）"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"セットアップを完了するには、タブレットでWi-Fiに接続する必要があります。セットアップ後にモバイルデータ通信とWi-Fiを切り替えられます。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"詳細オプションを表示"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi保護設定"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPSを開始しています…"</string>
@@ -725,15 +723,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁紙"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"壁紙の選択先:"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"スリープモード"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"スクリーンセーバー"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"ホルダー装着時またはスリープ/充電時"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"いずれか"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ホルダー装着時"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"OFF"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"携帯端末のホルダー装着時やスリープ時の動作を管理するにはスリープモードをONにします。"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"スリープ開始のタイミング"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"スリープ開始"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"スクリーンセーバー開始のタイミング"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"今すぐ開始"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
@@ -1662,8 +1660,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"現在有効なトレースはない"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"現在<xliff:g id="NUM">%1$d</xliff:g>件のトレースが有効"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"現在トレースはすべて有効"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGLトレースを有効化"</string>
     <string name="debug_layout" msgid="5981361776594526155">"レイアウト境界を表示"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"クリップの境界線、マージンなどを表示"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU使用状況を表示"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index da81aff..ac86266 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"화면 잠금 선택"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"백업 잠금 선택"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"화면 잠금"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"상태 위젯"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"기타 위젯"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"위젯 추가"</string>
     <string name="widget_none" msgid="2708702293215501854">"없음"</string>
     <string name="widget_default" msgid="8269383575996003796">"시계"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"화면 잠금 변경"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"다른 네트워크…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"더보기"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"자동 설정(WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"설정을 완료하려면 태블릿이 Wi-Fi에 액세스해야 합니다. 설정 후 모바일 데이터와 Wi-Fi 간에 전환할 수 있습니다."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"고급 옵션 표시"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS(Wi-Fi 간편 설정)"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS을 시작하는 중…"</string>
@@ -722,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"배경화면"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"배경화면 선택"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"절전 모드"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"도킹할 때 또는 대기상태이거나 충전할 때"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"도킹이나 대기상태일 때"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"충전하는 동안"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"도킹할 때"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"사용 안함"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"휴대전화가 도킹 또는 절전 모드일 때 작동 방식을 조정하려면 절전 모드를 사용하도록 설정하세요."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"절전 모드로 전환 시점"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"절전 모드로 전환"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"화면 보호기 전환 시점"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"시작하기"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"설정"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 6a4f728..f58bca0 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1 920 x 1 080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi ir 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Nėra"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"„Systrace“ (grafika)"</item>
+    <item msgid="1340692776955662664">"Kreipinių dėklas „glGetError“"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
     <item msgid="4071574792028999443">"Nėra fono procesų"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7c6b229..f78b219 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pasir. ekrano užrak."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pasirinkti atsarginį užrakinimą"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrano užraktas"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Būsenos valdiklis"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Kitas valdiklis"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Pridėti valdiklį"</string>
     <string name="widget_none" msgid="2708702293215501854">"Nėra"</string>
     <string name="widget_default" msgid="8269383575996003796">"Laikrodis"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Pakeisti užrak. ekraną"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridėti tinklą"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"„Wi-Fi“ tinklai"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS paspaudimo mygt."</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Daugiau parinkčių"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kodo įrašas"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Tiesiog. „Wi-Fi“ r."</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Nuskaityti"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Kitas tinklas…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Daugiau"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatinė sąranka (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Kad užbaigtumėte sąranką, planšetiniam kompiuteriui reikalinga prieiga prie „Wi-Fi“. Baigę sąranką galėsite perjungti iš mobiliojo ryšio duomenų į „Wi-Fi“ ir atvirkščiai."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Rodyti išplėstines parinktis"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Apsaugota „Wi-Fi“ sąranka"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pradedama WPS…"</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pasirinkti darbalaukio foną iš"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Miego režimas"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Svajonė"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kai yra doke arba kai veikia miego režimas ir kraunamas akumuliatorius"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bet kuris variantas"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Įkraunant"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kai yra doke"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Išjungta"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Jei norite valdyti, kas vyksta, kai telefonas yra prijungtas prie doko ir (arba) veikia miego režimu, įjunkite miego režimą."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kada įjungti miego režimą"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Įjungti miego režimą dabar"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada svajoti"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pradėti dabar"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nustatymai"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Šiuo metu neįgalinta jokių pėdsakų"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Šiuo metu įgalinta pėdsakų: <xliff:g id="NUM">%1$d</xliff:g>"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Šiuo metu visi pėdsakai įgalinti"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Įgalinti „OpenGL“ pėdsak."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Rodyti išdėstymo ribas"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Rodyti iškarpų ribas, kraštines ir t. t."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Rodyti centr. proc. naud."</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 8b7b60b..f5e50a8 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280 x 720 tvdpi un 1920 x 1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Nav"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (grafika)"</item>
+    <item msgid="1340692776955662664">"glGetError: zvanu kaskāde"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standarta ierobežojums"</item>
     <item msgid="4071574792028999443">"Nav fona procesu"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 006c342..90618c8 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekrāna bloķēš. izvēle"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Rezerves bloķ. izvēle"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrāna bloķēšana"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Statusa logrīks"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Cits logrīks"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Logrīka pievienošana"</string>
     <string name="widget_none" msgid="2708702293215501854">"Neviens"</string>
     <string name="widget_default" msgid="8269383575996003796">"Pulkstenis"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Bloķ. ekr. izmaiņas"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Pievienot tīklu"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi tīkli"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS spiedpoga"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Citas opcijas"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN ievade"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skenēt"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Cits tīkls..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Vairāk"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. iestatīšana (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Lai pabeigtu iestatīšanu, planšetdatoram ir nepieciešams Wi-Fi savienojums. Pēc iestatīšanas varat pārslēgties starp mobilo tīklu un Wi-Fi tīklu."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Rādīt papildopcijas"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi aizsargātā iestatīšana"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Notiek WPS sākšana..."</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fona tapetes izvēle no"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Miega režīms"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Ekrānsaudzētājs"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kad tālrunis tiek dokots vai ir miega režīmā un notiek uzlāde"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Vienā no gadījumiem"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Uzlādes laikā"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kamēr tiek dokots"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izslēgts"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Lai kontrolētu, kas notiek ar tālruni, kad tas tiek dokots un/vai atrodas miega režīmā, ieslēdziet miega režīmu."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kad ieslēgt miega režīmu"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Ieslēgt miega režīmu"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Ekrānsaudzētāja režīmā"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Sākt tūlīt"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Iestatījumi"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Pašlaik nav iespējota neviena trase."</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Pašlaik iespējotas <xliff:g id="NUM">%1$d</xliff:g> trases."</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Pašlaik iespējotas visas trases."</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Iespējot OpenGL trases"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Rādīt izkārtojuma robežas"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Rādīt klipu robežas, malas utt."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Rādīt CPU lietojumu"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 736a296..e8c3945 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci skrin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih kunci sandaran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kunci skrin"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget status"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Widget lain"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Tambah widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Tiada"</string>
     <string name="widget_default" msgid="8269383575996003796">"Jam"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Tukar kunci skrin"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Rangkaian lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lagi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Persediaan automatik (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Untuk melengkapkan persediaan, tablet anda memerlukan akses ke Wi-Fi. Sesudah persediaan, anda boleh beralih antara data mudah alih dan Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tunjukkan pilihan terperinci"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Persediaan Terlindung Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulakan WPS…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih kertas dinding dari"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Mod Tidur"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Lamun"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Apabila didok atau tidur dan dicas"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Salah satu"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Semasa mengecas"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Semasa didok"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dimatikan"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Untuk mengawal apa yang berlaku semasa telefon didok dan/atau tidur, hidupkan Mod Tidur."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Bila masa untuk tidur"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Tidur sekarang"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Bila untuk melamun"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulakan sekarang"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Tetapan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index ce8e089..8a0bc5b 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280 x 720 tvdpi og 1920 x 1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ingen"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (grafikk)"</item>
+    <item msgid="1340692776955662664">"Ring stabel på glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard grense"</item>
     <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3b2b46b..005d741 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Velg skjermlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Velg reservelås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skjermlås"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Statusmodul"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Annen modul"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Legg til modul"</string>
     <string name="widget_none" msgid="2708702293215501854">"Ingen"</string>
     <string name="widget_default" msgid="8269383575996003796">"Klokke"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Endre skjermlås"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Legg til nettverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Knapp for auto. WPS-lev."</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Flere alternativer"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Skriv inn WPS-kode"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skann"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Annet nettverk"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Se mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"For å fullføre konfigurasjonen, må nettbrettet være tilkoblet Wi-Fi. Etter konfigurasjonen kan du bytte mellom mobildata og Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avanserte alternativer"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beskyttet Wi-Fi-konfigurasjon (WPS)"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS …"</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivivitet"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Velg bakgrunnsbilde fra"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Hvilemodus"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Når enheten er plassert i dokken eller under lading i hvilemodus"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enten eller"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under lading"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheten er plassert i dokken"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Hvis du vil kontrollere hva som skjer når telefonen er plassert i dokken og/eller hviler, slår du på hvilemodus."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Når skal hvilemodus aktiveres?"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Aktiver hvilemodus"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Når dagdrøm-modusen skal brukes"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nå"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Innstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
@@ -1656,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Ingen aktiverte spor for øyeblikket"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spor er aktivert for øyeblikket"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"For øyeblikket er alle sporene er aktiverte"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiver OpenGL-spor"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis kantene i utformingen"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Vis kanter, marger osv."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-bruk"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fed13b4..2f50bcc 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Schermvergr. kiezen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Back-upvergr. kiezen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Schermvergrendeling"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Statuswidget"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Andere widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Widget toevoegen"</string>
     <string name="widget_none" msgid="2708702293215501854">"Geen"</string>
     <string name="widget_default" msgid="8269383575996003796">"Klok"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schermvergr. wijzigen"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Meer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. config. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Om de configuratie te voltooien, heeft uw tablet toegang tot wifi nodig. Na de configuratie kunt u schakelen tussen mobiele gegevens en wifi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Geavanceerde opties weergeven"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beveiligde configuratie voor wifi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS starten…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Achtergrond"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Achtergrond kiezen van"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Slaapmodus"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdromen"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wanneer gedockt, in slaapstand of tijdens het opladen"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Een van beide"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijdens het opladen"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Wanneer gedockt"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Uit"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Schakel Slaapmodus in om te bepalen wat er gebeurt wanneer de telefoon is gedockt en/of de slaapmodus actief is."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Wanneer slapen"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Nu slapen"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wanneer dagdromen"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Nu beginnen"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellingen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f059eb9..3b21049 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Wybierz blokadę zapasową"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blokada ekranu"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widżet stanu"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Inny widżet"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Dodaj widżet"</string>
     <string name="widget_none" msgid="2708702293215501854">"Brak"</string>
     <string name="widget_default" msgid="8269383575996003796">"Zegar"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmień blokadę ekranu"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Inna sieć…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Więcej"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autokonfiguracja (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Do ukończenia konfiguracji tablet potrzebuje połączenia z Wi-Fi. Potem będziesz mieć możliwość przełączania między przesyłaniem danych przez sieć komórkową i Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Opcje zaawansowane"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Konfiguracja zabezpieczonej sieci Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Uruchamianie WPS..."</string>
@@ -722,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Wybierz tapetę z..."</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Tryb uśpienia"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Podczas zadokowania lub uśpienia i ładowania"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Albo"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Podczas ładowania"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Podczas zadokowania"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Wył."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Aby określić działanie po zadokowaniu i/lub uśpieniu telefonu, włącz tryb uśpienia."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kiedy zasnąć"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Zaśnij teraz"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Ustawienia wygaszacza"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Zacznij teraz"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ustawienia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index fc15ac0..7d82635 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi e 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Nada"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (Gráficos)"</item>
+    <item msgid="1340692776955662664">"Pilha de chamadas em glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 50c120d..475a56d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Selec. bloq. do ecrã"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Escolher bloq. cópia seg."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de ecrã"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget de estado"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Outro widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Adicionar widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Nenhum"</string>
     <string name="widget_default" msgid="8269383575996003796">"Relógio"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar ecrã de bloq."</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Mais opções"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introdução PIN WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Procurar"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Para concluir a configuração, o tablet necessita de acesso à rede Wi-Fi. Após a configuração, poderá alternar entre dados móveis e Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuração Wi-Fi Protegida"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"A iniciar WPS..."</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Escolher imagem de fundo de"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Modo de Suspensão"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Sonho"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando ancorado ou em suspensão e a carregar"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Qualquer dos modos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Enquanto está a carregar"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Enquanto ancorado"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desligado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar o que acontece quando o telemóvel está ancorado e/ou em suspensão, ative o Modo de Suspensão."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Quando deve entrar em suspensão"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Colocar em suspensão agora"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando sonhar acordado"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar agora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Definições"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Sem rastreios ativados atualmente"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> rastreios ativados atualmente"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Todos os rastreios ativados atualmente"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar vestígios OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar limit. do esquema"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Apresentar limites de clipes, margens, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar utilização da CPU"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index dac7ce1..0371759 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Selec. o bloq. de backup"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget de status"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Outro widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Adicionar widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Nenhum"</string>
     <string name="widget_default" msgid="8269383575996003796">"Relógio"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar tela bloqueio"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuração automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Para concluir a configuração, o tablet precisa de acesso à rede Wi-Fi. Após a instalação, você poderá alternar entre os dados móveis e o Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Config. protegida do Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando WPS…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecionar plano de fundo de"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Modo de suspensão"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando encaixado ou suspenso e carregando"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ou"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ao carregar"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando encaixado"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar o que acontece quando o telefone está encaixado e/ou suspenso, ative o modo de suspensão."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Quando suspender"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Suspender"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando iniciar Daydreams"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Começar agora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 8d07652..08c88d7 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -497,9 +497,7 @@
     <skip />
     <!-- no translation found for unlock_set_unlock_launch_picker_title (2084576942666016993) -->
     <skip />
-    <!-- no translation found for choose_lockscreen_status_widget_picker_title (441723074728339356) -->
-    <skip />
-    <!-- no translation found for choose_user_selected_lockscreen_widget_picker_title (8722165189176138931) -->
+    <!-- no translation found for choose_user_selected_lockscreen_widget_picker_title (2016562665711402130) -->
     <skip />
     <!-- no translation found for widget_none (2708702293215501854) -->
     <skip />
@@ -841,7 +839,8 @@
     <skip />
     <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
     <skip />
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <!-- no translation found for wifi_required_info_text (9014073093293520112) -->
+    <skip />
     <!-- no translation found for wifi_show_advanced (1793703023711426246) -->
     <skip />
     <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
@@ -1104,7 +1103,7 @@
     <skip />
     <!-- no translation found for wallpaper_settings_fragment_title (519078346877860129) -->
     <skip />
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
     <skip />
     <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
     <skip />
@@ -1118,9 +1117,9 @@
     <skip />
     <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
     <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
+    <!-- no translation found for screensaver_settings_when_to_dream (8352267826043957746) -->
     <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
+    <!-- no translation found for screensaver_settings_dream_start (4998187847985120168) -->
     <skip />
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index abf225e..f208e5e 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi şi 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Niciuna"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (imagini)"</item>
+    <item msgid="1340692776955662664">"Apelaţi stiva pentru glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limita standard"</item>
     <item msgid="4071574792028999443">"Nu există procese de fundal"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 635419f..e8f5ea7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Aleg. blocare rezervă"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget de stare"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Alt widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Adăugaţi un widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Niciunul"</string>
     <string name="widget_default" msgid="8269383575996003796">"Ceas"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbaţi bloc.ecran."</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Adăugaţi o reţea"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Reţele Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Buton WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Mai multe opţiuni"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introduceţi PIN WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanaţi"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Altă reţea…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mai multe"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automată (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Pentru a finaliza configurarea, este necesar ca tableta să aibă acces la Wi-Fi. După configurare, puteţi opta să utilizaţi datele mobile sau Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Afişaţi opţiunile avansate"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configurare protejată Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Se porneşte WPS…"</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aleg. o imag. de fundal de la"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Modul inactiv"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Oricare"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"În timpul încărcării"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Când dispozitivul este andocat"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dezactivat"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Pentru a controla ceea ce se întâmplă când telefonul este andocat şi/sau în modul inactiv, activaţi modul inactiv."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Când se activează modul inactiv"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Activaţi modul inactiv acum"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Când porneşte Daydreams"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Începeţi acum"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setări"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
@@ -1657,8 +1656,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"În prezent, nu există monitorizări activate"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> (de) monitorizări activate în prezent"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Toate monitorizările activate în prezent"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Monitorizări OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite aspect"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afişaţi limitele clipului, marginile etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 2a3a698..c025ed0 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920 x 1080 пикс. (xhdpi)"</item>
     <item msgid="3646519549495410112">"1280x720 (tvdpi)/1920x1080 (xhdpi)"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Нет данных"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (графика)"</item>
+    <item msgid="1340692776955662664">"Список вызовов в glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартное ограничение"</item>
     <item msgid="4071574792028999443">"Без фоновых процессов"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0309eb8..1d1543f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокировка экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Доп. способ блокировки"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокировка экрана"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Основной виджет"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Дополнительный виджет"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Выберите виджет"</string>
     <string name="widget_none" msgid="2708702293215501854">"Нет"</string>
     <string name="widget_default" msgid="8269383575996003796">"Часы"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Изменение блок. экрана"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавить сеть"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сети Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Ещё"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Вход по PIN-коду WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Поиск"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Другие сети…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ещё"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автонастройка (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Для завершения настройки необходимо подключение к сети Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Дополнительно"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Безопасная настройка Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS…"</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Обои"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Установка обоев"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Спящий режим"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"При подключении к док-станции, при переходе в спящий режим и во время зарядки"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Либо"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Всегда"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Во время зарядки"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"При подключении к док-станции"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"В док-станции"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ВЫКЛ"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Чтобы знать, что происходит с телефоном, когда он подключен к док-станции или находится в спящем режиме, включите заставку."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Когда включать спящий режим"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Спящий режим"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Когда включать"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Включить"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
@@ -1656,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Все трассировки отключены"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Включено трассировок: <xliff:g id="NUM">%1$d</xliff:g>"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Все трассировки включены"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Разрешить трассировку OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показывать границы макета"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показывать границы клипа, поля и т. д."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index cc2c2ef..0a5865c 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1 920 x 1 080 xhdpi"</item>
     <item msgid="3646519549495410112">"1 280 x 720 tvdpi a 1 920 x 1 080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Žiadne"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (grafika)"</item>
+    <item msgid="1340692776955662664">"Volať zásobník pri chybe glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Štandardný limit"</item>
     <item msgid="4071574792028999443">"Žiadne procesy na pozadí"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index da5d2cc..0e24a0c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zvoľte uzamk. obrazov."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vybrať zámku zálohy"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Uzamknutie obrazovky"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Miniaplikácia stavu"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Iná miniaplikácia"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Pridať miniaplikáciu"</string>
     <string name="widget_none" msgid="2708702293215501854">"Žiadne"</string>
     <string name="widget_default" msgid="8269383575996003796">"Hodiny"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmeniť uzamknutie obrazovky"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridať sieť"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Siete Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačidlo WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Ďalšie možnosti"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadanie kódu WPS PIN"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Priame prip. Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Iná sieť..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Viac"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Tablet potrebuje na dokončenie nastavení prístup k sieti Wi-Fi. Po nastavení môžete prepínať medzi mobilným dátovým pripojením a sieťou Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobraziť rozšírené možnosti"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Zabezpečené nastavenie siete Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spúšťanie WPS…"</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Režim spánku"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Pri vložení do doku alebo pri nabíjaní v režime spánku"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Oboje"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pri nabíjaní"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Počas prítomnosti zariadenia v doku"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vypnuté"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ak chcete nastaviť, čo sa stane, keď sa telefón vloží do doku alebo je v režime spánku, zapnite Režim spánku."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kedy spať"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Spať"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kedy spustiť šetrič obrazovky"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Spustiť"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavenia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
@@ -1656,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Momentálne nie sú povolené žiadne sledovania"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Počet aktuálne povolených sledovaní: <xliff:g id="NUM">%1$d</xliff:g>"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Všetky sledovania sú v súčasnosti povolené"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povoliť trasovanie OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobraziť hranice rozlož."</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobraziť v klipe ohraničenie, okraje a pod."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobraziť využitie CPU"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 7f4f550..f229d76 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280 x 720 tvdpi in 1920 x 1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Brez"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (grafika)"</item>
+    <item msgid="1340692776955662664">"Pri napaki glGetError kliči sklad"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna omejitev"</item>
     <item msgid="4071574792028999443">"Ni postopkov v ozadju"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a6b245e..bfd8530 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zakl. zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Izberite varnostno zaklepanje"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaklepanje zaslona"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Pripomoček za stanje"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Drug pripomoček"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Dodajanje pripomočka"</string>
     <string name="widget_none" msgid="2708702293215501854">"Brez"</string>
     <string name="widget_default" msgid="8269383575996003796">"Ura"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Sprememba zakl. zasl."</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj omrežje"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Brezžična omrežja"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Gumb za WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Več možnosti"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Vnos kode PIN za WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Išči"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Drugo omrežje ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Več"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Samodej. nastavitev (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Če želite končati namestitev, mora imeti tablični računalnik dostop do povezave Wi-Fi. Po namestitvi lahko preklopite med mobilnim podatkovnim omrežjem in omrežjem Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaz dodatnih možnosti"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Zaščitena nastavitev Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Zagon nastavitve WPS ..."</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izberite ozadje iz"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Stanje pripravljenosti"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Sanjarjenje"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"V stojalu ali v stanju pripravljenosti in med polnjenjem"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Eno ali drugo"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Med napajanjem"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"V stojalu"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izklopljeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Če želite nadzorovati, kaj se dogaja, ko je telefon v stojalu in/ali v stanju pripravljenosti, vklopite »Stanje pripravljenosti«."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Čas preklopa v stanje pripravljenosti"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Stanje pripravljenosti"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdaj sanjariti"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začnite zdaj"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavitve"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Trenutno ni omogočenih sledi"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Št. trenutno omogočenih sledi: <xliff:g id="NUM">%1$d</xliff:g>"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Vse sledi so trenutno omogočene"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogoči sledi OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Prikaz mej postavitve"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaži meje obrezovanja, obrobe ipd."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži uporabo CPE-ja"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 51d4c28..4fbaaa6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Избор закључав. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Закључавање рез. коп."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Закључавање екрана"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Виџет статусa"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Други виџет"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Додај виџет"</string>
     <string name="widget_none" msgid="2708702293215501854">"Ниједан"</string>
     <string name="widget_default" msgid="8269383575996003796">"Сат"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промена закључ. екрана"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Још"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аутоматско подешавање (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Да бисте довршили подешавање, таблет треба да има приступ Wi-Fi мрежи. Након подешавања, можете да прелазите са мобилне мреже на Wi-Fi и обратно."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Прикажи напредне опције"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Заштићено подешавање Wi-Fi-ја"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Покретање WPS-а..."</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Позадина"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избор позадине из"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Режим спавања"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Сањарење"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Када је на базној станици или у стању спавања и пуни се"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Било које"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Током пуњења"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Док је на базној станици"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Искључено"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Да бисте контролисали шта се дешава када је телефон на базној станици и/или у стању спавања, укључите Режим спавања."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Када треба активирати спавање"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Спавај одмах"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Када да укључите сањарење"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Започни одмах"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Подешавања"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index f4d5845..44ce64c 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280 x 720 tvdpi och 1920 x 1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Inga"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (grafik)"</item>
+    <item msgid="1340692776955662664">"Anropsstacken på glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgräns"</item>
     <item msgid="4071574792028999443">"Inga bakgrundsprocesser"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8c370dd..153d834 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Välj skärmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Välj lås för säkerhetskopiering"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skärmlås"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Statuswidget"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Andra widgets"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Lägg till widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Inga"</string>
     <string name="widget_default" msgid="8269383575996003796">"Klocka"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Byt skärmlås"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Lägg till nätverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-nätverk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-tryckknapp"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Fler alternativ"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi direkt"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanna"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Annat nätverk …"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk installation (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Surfplattan måste vara ansluten till Wi-Fi för att du ska kunna slutföra konfigurationen. När du är färdig med konfigurationen kan du välja mellan mobildataanslutning och Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Visa avancerade alternativ"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Skyddad Wi-Fi-konfiguration"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Startar WPS ..."</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Viloläge"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrömmar"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"När enheten dockas eller laddas i viloläge"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Antingen"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under laddning"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Medan enheten dockas"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Om du vill styra vad som händer när mobilen är dockad och/eller i viloläge aktiverar du Viloläge."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Då ska viloläge aktiveras"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Viloläge nu"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Då ska dagdrömmar aktiveras"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Starta nu"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Inställningar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Inga spår är aktiverade för närvarande"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spår är aktiverade för närvarande"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alla spår är aktiverade för närvarande"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivera OpenGL-spår"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Visa layoutgränser"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Visa gränser för videoklipp, marginaler m.m."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Visa CPU-användning"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e121254..c532649 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -343,8 +343,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chagua kifungio cha skrini"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chagua kifungio cha hifadhi"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kufunga skrini"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Wijeti ya hali"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Wiji nyingine"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Ongeza Wijeti"</string>
     <string name="widget_none" msgid="2708702293215501854">"Hamna"</string>
     <string name="widget_default" msgid="8269383575996003796">"Saa"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"badilisha kufunga kwa skrini"</string>
@@ -554,7 +553,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Mtandao mwingine..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi otomatiki (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ili kukamilisha usanidi, kompyuta yako ndogo inahitaji ufikiaji katika Wi-Fi. Baada usanidi,  unaweza kubadili kati ya data ya simu na Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Onyesha chaguo za kindani"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Usanidi Uliolindwa na Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Inaanzisha WPS ..."</string>
@@ -714,15 +713,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ya kutokuwa na shughuli"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Mandhari"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chagua mandhari kutoka"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Modi ya Kulala"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Ndoto ya mchana"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wakati inapogatiwa au kulala na inachaji"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"au"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Inapochaji"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Inapogatiwa"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Imezimwa"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ili kudhibiti kinachotendeka simu inapogatiwa na/au inapolala, washa Modi ya Kulala."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Wakati wa kulala"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Lala sasa"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wakati wa ndoto za mchana"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Anza sasa"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Mipangilio"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ca74cec..46b20e9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"เลือกการล็อกหน้าจอ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"เลือกการล็อกข้อมูลสำรอง"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"วิดเจ็ตสถานะ"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"วิดเจ็ตอื่นๆ"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"เพิ่มวิดเจ็ต"</string>
     <string name="widget_none" msgid="2708702293215501854">"ไม่มี"</string>
     <string name="widget_default" msgid="8269383575996003796">"นาฬิกา"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"เปลี่ยนหน้าจอล็อก"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"เครือข่ายอื่น…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"เพิ่มเติม"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"การตั้งค่าอัตโนมัติ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"เพื่อดำเนินการตั้งค่าให้เสร็จสิ้น แท็บเล็ตของคุณต้องเข้าถึง WiFi หลังจากการตั้งค่า คุณจะสามารถสลับระหว่างข้อมูลมือถือและ WiFi ได้"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"แสดงตัวเลือกขั้นสูง"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"การตั้งค่าการป้องกัน WiFi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"กำลังเริ่มต้น WPS…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"วอลเปเปอร์"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"เลือกวอลเปเปอร์จาก"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"โหมดสลีป"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"เมื่อวางบนแท่นชาร์จหรืออยู่ในโหมดสลีปและกำลังชาร์จ"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"แบบใดก็ได้"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"ขณะที่ชาร์จ"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ในขณะวางอยู่บนแท่นชาร์จ"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ปิด"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"หากต้องการควบคุมสิ่งที่จะเกิดขึ้นเมื่อโทรศัพท์วางอยู่บนแท่นชาร์จและ/หรืออยู่ในโหมดสลีป ให้เปิดโหมดสลีปไว้"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"เข้าสู่โหมดสลีปเมื่อใด"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"เข้าสู่โหมดสลีปเลย"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"เมื่อใดจึงจะ Daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"เริ่มเลย"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"การตั้งค่า"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
@@ -1662,7 +1661,7 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"การวางซ้อนหน้าจอที่แสดงการใช้ CPU ในปัจจุบัน"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"เร่งการแสดงผลของ GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"ต้องใช้ GPU สำหรับการวาดภาพ 2 มิติ"</string>
-    <string name="force_msaa" msgid="7920323238677284387">"Force 4x MSAA"</string>
+    <string name="force_msaa" msgid="7920323238677284387">"บังคับใช้ 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"เปิดใช้งาน 4x MSAA ในแอปพลิเคชัน OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"การแสดงผล GPU ตามโปรไฟล์"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"วัดเวลาที่ใช้แสดงผลใน adb shell dumpsys gfxinfo"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 78de2a8..ff858d8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pumili ng screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pumili ng backup na lock"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"I-screen lock"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Widget ng katayuan"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Iba pang widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Magdagdag ng Widget"</string>
     <string name="widget_none" msgid="2708702293215501854">"Wala"</string>
     <string name="widget_default" msgid="8269383575996003796">"Orasan"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Baguhin ang lock ng screen"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Iba pang network..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Awtomatikong setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Upang makumpleto ang pag-setup, kailangan ng iyong tablet ng access sa Wi-Fi. Pagkatapos ng pag-setup, maaari kang magpalipat-lipat sa pagitan ng mobile data at Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Ipakita ang mga advanced na pagpipilian"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Protektadong Setup ng Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Sinisimulan ang WPS…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pumili ng wallpaper mula sa"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Sleep Mode"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kapag naka-dock o naka-sleep at nagcha-charge"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Alinman"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Habang nagcha-charge"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Habang naka-dock"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Naka-off"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Upang kontrolin kung ano ang nangyayari kapag naka-dock at/o naka-sleep ang telepono, i-on ang Sleep Mode."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kailan magsi-sleep"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Mag-sleep ngayon"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kailan magde-daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Magsimula ngayon"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Mga Setting"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index a8713ff..c76985c 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi ve 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Hiçbiri"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (Grafik)"</item>
+    <item msgid="1340692776955662664">"glGetError\'da yığın çağır"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standart sınır"</item>
     <item msgid="4071574792028999443">"Arka planda işlem yok"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6fbdbdd..67a2b46 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidini seçin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Yedek kilidi seçin"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran kilidi"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Durum widget\'ı"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Diğer widget"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Widget ekle"</string>
     <string name="widget_none" msgid="2708702293215501854">"Hiçbiri"</string>
     <string name="widget_default" msgid="8269383575996003796">"Saat"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekrn kilidini değştr"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Ağ ekle"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Kablosuz ağlar"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Düğmesi"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Diğer seçenekler"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Girişi"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Kablosuz Doğrudan Bağlantı"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tara"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Diğer ağ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Diğer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Otomatik kurulum (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Kurulumu tamamladıktan sonra tabletinizin Kablosuz bağlantıya erişmesi gerekecektir. Kurulumdan sonra, mobil veri ile Kablosuz arasında geçiş yapabilirsiniz."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Gelişmiş seçenekleri göster"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kablosuz Korumalı Kurulum"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS başlatılıyor…"</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Şuradan duvar kağıdı seçin:"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Uyku Modu"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Yuvadayken veya uyku modunda ve şarj edilirken"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"İkisinden biri"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Şarj olurken"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Yuvadayken"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Kapalı"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Telefon yuvaya yerleştirildiğinde ve/veya uyku durumunda iken ne olacağını kontrol etmek için Uyku Modunu etkinleştirin."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Uykuya geçme zamanı"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Şimdi uyu"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Hafif uykuya geçilecek zaman"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Şimdi başla"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ayarlar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
@@ -1656,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Şu anda hiçbir iz etkin değil"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Şu anda <xliff:g id="NUM">%1$d</xliff:g> iz etkin"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Tüm izler şu anda etkin"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL izlerini etkinleştir"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Düzen sınırlarını göster"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Klip sınırlarını, kenar boşluklarını vb. göster"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU kullanımını göster"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4e7aeaa..fbcce7c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Тип блокув. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Вибер. резерв. блокув."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокування екрана"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Віджет статусу"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Інший віджет"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Додати віджет"</string>
     <string name="widget_none" msgid="2708702293215501854">"Немає"</string>
     <string name="widget_default" msgid="8269383575996003796">"Годинник"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змінити блокув. екрана"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Інша мережа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Більше"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авто-налаштування (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Щоб завершити налаштування, вашому планшетному ПК потрібен доступ до Wi-Fi. Після налаштування можна переключатися між мобільним передаванням даних і Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показати розширені параметри"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Налаштування захищеної мережі Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS..."</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Після <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Фоновий малюнок"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Вибрати фоновий малюнок з"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Режим сну"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Заставка"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Коли в док-станції або в режимі сну й заряджання"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Будь-який"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Під час заряджання"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Коли в док-станції"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Вимк."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Щоб знати, що відбувається з телефоном, коли він у док-станції та/або в режимі сну, увімкніть режим сну."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Коли переходити в режим сну"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Перейти в режим сну"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Коли вмикати заставку"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Почати зараз"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Налаштування"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 2479cfc..9ed2783 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi và 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Không có"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (Đồ họa)"</item>
+    <item msgid="1340692776955662664">"Chồng lệnh trên glGetError"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Giới hạn tiêu chuẩn"</item>
     <item msgid="4071574792028999443">"Không có quá trình nền"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 617f667..dff97ca 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chọn khóa màn hình"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chọn khóa dự phòng"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Khóa màn hình"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Tiện ích trạng thái"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Tiện ích khác"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Thêm tiện ích con"</string>
     <string name="widget_none" msgid="2708702293215501854">"Không có"</string>
     <string name="widget_default" msgid="8269383575996003796">"Đồng hồ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Thay đổi màn hình khóa"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Thêm mạng"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mạng Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Nút Đẩy WPS"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Tùy chọn khác"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Nhập mã pin WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Dò"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Mạng khác…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Thêm"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Thiết lập tự động (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Để hoàn tất quá trình thiết lập, máy tính bảng của bạn cần quyền truy cập vào Wi-Fi. Sau khi thiết lập, bạn có thể chuyển giữa dữ liệu di động và Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Hiển thị tùy chọn nâng cao"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Thiết lập Wi-Fi được bảo vệ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Đang khởi động WPS…"</string>
@@ -723,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chọn hình nền từ"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Chế độ ngủ"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Mơ màng"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Khi được gắn đế hoặc ở chế độ ngủ và sạc pin"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Hoặc"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Trong khi sạc"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi được gắn đế"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Tắt"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật Chế độ ngủ."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Thời điểm ngủ"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Bắt đầu chế độ ngủ"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Khi mơ màng"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Bắt đầu ngay"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Cài đặt"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
@@ -1656,8 +1654,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"Hiện không có dấu vết nào được bật"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> dấu vết hiện đang được bật"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Tất cả dấu vết hiện đang được bật"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Bật theo dõi OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Hiển thị ranh giới bố cục"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Hiển thị viền đoạn video, lề, v.v.."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Hiển thị mức sử dụng CPU"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 4fe696d..3d38157 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -260,10 +260,12 @@
     <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
     <item msgid="3646519549495410112">"1280x720 tvdpi 和 1920x1080 xhdpi"</item>
   </string-array>
-    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
-    <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
-    <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
-    <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"无"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace（图形）"</item>
+    <item msgid="1340692776955662664">"glGetError 上的调用堆栈"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e7f818a..43896dc5a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"状态小部件"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"其他小部件"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"添加小部件"</string>
     <string name="widget_none" msgid="2708702293215501854">"无"</string>
     <string name="widget_default" msgid="8269383575996003796">"时钟"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改锁定屏幕"</string>
@@ -549,8 +548,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"添加网络"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 网络"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按钮"</string>
-    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
-    <skip />
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多选项"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 输入"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
@@ -563,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"其他网络…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自动设置 (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"要完成设置，您的平板电脑需要访问 Wi-Fi 网络。设置完毕后，您将可以在移动数据网络和 Wi-Fi 网络之间切换。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"显示高级选项"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi 保护设置"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在启动 WPS..."</string>
@@ -723,15 +721,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"无操作 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁纸"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"选择壁纸来源"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"休眠模式"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"插入基座或休眠且正在充电时"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"任意一种情况"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充电时"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"插入基座时"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"已关闭"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"要控制手机在插入基座时和/或休眠状态下的行为，请启用“休眠模式”。"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"何时休眠"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"立即休眠"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"何时启动"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"立即启动"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"设置"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
@@ -1656,8 +1655,7 @@
     <string name="enable_traces_summary_none" msgid="1867562808503494163">"当前未启用任何跟踪"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"当前已启用 <xliff:g id="NUM">%1$d</xliff:g> 项跟踪"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"当前已启用所有跟踪"</string>
-    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
-    <skip />
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"启用 OpenGL 跟踪"</string>
     <string name="debug_layout" msgid="5981361776594526155">"显示布局边界"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"显示剪辑边界、边距等。"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"显示 CPU 使用情况"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5f233f6..3cf7785 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"選擇備用解鎖方式"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"狀態小工具"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"其他小工具"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"新增小工具"</string>
     <string name="widget_none" msgid="2708702293215501854">"無"</string>
     <string name="widget_default" msgid="8269383575996003796">"時鐘"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"變更鎖定畫面"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"其他網路…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定 (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"您的平板電腦必須連上 WiFi 網路才能完成設定。設定完成後，您可以在行動數據網路與 WiFi 網路之間切換。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"顯示進階選項"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WiFi 保護設定"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在啟動 WPS…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"桌布"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"選擇桌布來源"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"休眠模式"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"安置於座架上或休眠及充電時"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"皆可"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"安置於座架上時"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"如要控制手機安置於座架上和/或休眠時的設定，請開啟休眠模式。"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"休眠時機"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"立即休眠"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Daydream 開啟時間"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"立即開啟"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dd06654..25284d6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -341,8 +341,7 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Khetha isivali sesikrini"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Khetha ukukhiywa kokulondoloza"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Isikrini sivaliwe."</string>
-    <string name="choose_lockscreen_status_widget_picker_title" msgid="441723074728339356">"Iwijethi yesimo"</string>
-    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="8722165189176138931">"Enye iwijethi"</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Faka iwijethi"</string>
     <string name="widget_none" msgid="2708702293215501854">"Akunalutho"</string>
     <string name="widget_default" msgid="8269383575996003796">"Iwashi"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Shintsha ukuvala isikrini"</string>
@@ -562,7 +561,7 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Enye inethiwekhi…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Okunye"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Ukusetha okuzenzakalelayo (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">""</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ukuze uqedele ukusetha, ithebulethi yakho idinga ukufinyelela ku-Wi-Fi. Ngemva kokusetha, ungashintsha phakathi kwedatha yeselula ne-Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Bonisa okukhethwa kukho okuseqophelweni"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ukusethwa Okuvikelwe kwe-Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iqala i-WPS…"</string>
@@ -722,15 +721,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Iphephadonga"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Khetha iphephalodonga kwi"</string>
-    <string name="screensaver_settings_title" msgid="830579400192185646">"Imodi yokulala"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Ukuphupha emini"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Uma kudokhiwe noma kulelwe futhi ishaja"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Noma"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ngenkathi ishaja"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Ngenkathi idokhiwe"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Valiwe"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ukuze ulawule ukuthi kwenzakale ini uma ifoni idokhiwe kanye/noma ilele, khanyisa imodi yokulala."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kulalwa nini"</string>
-    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Lala manje"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Uma kuphupha emini"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Qala manje"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Izilungiselelo"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25b9413..a302658 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -808,11 +808,8 @@
     <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_launch_picker_title">Screen lock</string>
 
-    <!--  Title for PreferenceScreen to launch picker for a user-selected time & data widget that will live on lock screen [CHAR LIMIT=22] -->
-    <string name="choose_lockscreen_status_widget_picker_title">Status widget</string>
-
     <!--  Title for PreferenceScreen to launch picker for a user-selected widget that will live on lock screen [CHAR LIMIT=22] -->
-    <string name="choose_user_selected_lockscreen_widget_picker_title">Other widget</string>
+    <string name="choose_user_selected_lockscreen_widget_picker_title">Add widget</string>
 
     <!--  String to display if there is no user-selected widget on lock screen [CHAR LIMIT=22] -->
     <string name="widget_none">None</string>
@@ -1786,7 +1783,7 @@
     <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
     <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
     <!-- Display settings screen, trigger for screen saver options -->
-    <string name="screensaver_settings_title">Daydreams</string>
+    <string name="screensaver_settings_title">Daydream</string>
     <!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked -->
     <string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string>
     <!-- Dream settings screen, dialog option, activated on sleep or docked -->
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 566f8c2..489a200 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -52,12 +52,6 @@
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
         <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
            android:key="choose_user_selected_lockscreen_widget"
            android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
            android:summary=""
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 08428b0..98422ba 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -27,12 +27,6 @@
             android:persistent="false"/>
 
         <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
            android:key="choose_user_selected_lockscreen_widget"
            android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
            android:summary=""
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index a9973fd..8374a13 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -39,12 +39,6 @@
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
         <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
            android:key="choose_user_selected_lockscreen_widget"
            android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
            android:summary=""
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index b764c13..8015785 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -43,12 +43,6 @@
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
         <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
            android:key="choose_user_selected_lockscreen_widget"
            android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
            android:summary=""
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index f0aacaa..70e95bd 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -39,12 +39,6 @@
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
         <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
            android:key="choose_user_selected_lockscreen_widget"
            android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
            android:summary=""
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index dda596a..26e2e20 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -96,7 +96,13 @@
     <!-- Do not nest these, or removals in code will break -->
     <PreferenceScreen
         android:key="dock_audio"
-        android:title="@string/dock_audio_settings_title" />
+        android:title="@string/dock_audio_settings_title">
+        <CheckBoxPreference
+            android:title="@string/bluetooth_dock_settings_a2dp"
+            android:key="dock_audio_media_enabled"
+            android:enabled="true"
+            />
+    </PreferenceScreen>
 
     <CheckBoxPreference
         android:key="dock_sounds"
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 0f9fcee..a899549 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -59,6 +59,7 @@
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String CONFIRM_CREDENTIALS = "confirm_credentials";
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
+        private static final String FINISH_PENDING = "finish_pending";
         public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
 
         private static final boolean ALWAY_SHOW_TUTORIAL = true;
@@ -68,6 +69,7 @@
         private KeyStore mKeyStore;
         private boolean mPasswordConfirmed = false;
         private boolean mWaitingForConfirmation = false;
+        private boolean mFinishPending = false;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -85,6 +87,7 @@
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
                 mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);
+                mFinishPending = savedInstanceState.getBoolean(FINISH_PENDING);
             }
 
             if (mPasswordConfirmed) {
@@ -101,7 +104,14 @@
             }
         }
 
-
+        @Override
+        public void onResume() {
+            super.onResume();
+            if (mFinishPending) {
+                mFinishPending = false;
+                finish();
+            }
+        }
 
         @Override
         public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
@@ -170,6 +180,7 @@
             // Saved so we don't force user to re-enter their password if configuration changes
             outState.putBoolean(PASSWORD_CONFIRMED, mPasswordConfirmed);
             outState.putBoolean(WAITING_FOR_CONFIRMATION, mWaitingForConfirmation);
+            outState.putBoolean(FINISH_PENDING, mFinishPending);
         }
 
         private void updatePreferencesOrFinish() {
@@ -352,10 +363,11 @@
                 intent.putExtra(CONFIRM_CREDENTIALS, false);
                 intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
                         isFallback);
-                if(isFallback) {
+                if (isFallback) {
                     startActivityForResult(intent, FALLBACK_REQUEST);
                     return;
                 } else {
+                    mFinishPending = true;
                     intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                     startActivity(intent);
                 }
@@ -369,22 +381,26 @@
                 intent.putExtra(CONFIRM_CREDENTIALS, false);
                 intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
                         isFallback);
-                if(isFallback) {
+                if (isFallback) {
                     startActivityForResult(intent, FALLBACK_REQUEST);
                     return;
                 } else {
+                    mFinishPending = true;
                     intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                     startActivity(intent);
                 }
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
                 Intent intent = getBiometricSensorIntent();
+                mFinishPending = true;
                 startActivity(intent);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
                 mChooseLockSettingsHelper.utils().clearLock(false);
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled);
                 getActivity().setResult(Activity.RESULT_OK);
+                finish();
+            } else {
+                finish();
             }
-            finish();
         }
 
         @Override
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index d0043e6..58d97a8 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -61,14 +61,14 @@
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
-                int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
-                int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
-                int invalidCharger = intent.getIntExtra(BatteryManager.EXTRA_INVALID_CHARGER, 0);
+                final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+                final int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+                final int invalidCharger = intent.getIntExtra(
+                    BatteryManager.EXTRA_INVALID_CHARGER, 0);
 
-                boolean levelOk = level >= MIN_BATTERY_LEVEL;
-                boolean pluggedOk =
-                    (plugged == BatteryManager.BATTERY_PLUGGED_AC ||
-                     plugged == BatteryManager.BATTERY_PLUGGED_USB) &&
+                final boolean levelOk = level >= MIN_BATTERY_LEVEL;
+                final boolean pluggedOk =
+                    ((plugged & BatteryManager.BATTERY_PLUGGED_ANY) != 0) &&
                      invalidCharger == 0;
 
                 // Update UI elements based on power/battery status
@@ -204,4 +204,3 @@
         ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference);
     }
 }
-
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 13b1d0d..7a5118b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -33,19 +33,21 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
 import android.os.UserHandle;
-import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.security.KeyStore;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.IWindowManager;
 import android.widget.Toast;
 
 import com.android.internal.widget.LockPatternUtils;
@@ -63,9 +65,7 @@
 
     // Lock Settings
     private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
-    private static final String KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET =
-            "choose_lockscreen_status_widget";
-    private static final String KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET =
+    private static final String KEY_CHOOSE_LOCKSCREEN_WIDGET =
             "choose_user_selected_lockscreen_widget";
     private static final String KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING =
             "biometric_weak_improve_matching";
@@ -76,15 +76,12 @@
     private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
     private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
     private static final String KEY_OWNER_INFO_SETTINGS = "owner_info_settings";
-    private static final String EXTRA_NO_WIDGET = "com.android.settings.NO_WIDGET";
     private static final String EXTRA_DEFAULT_WIDGET = "com.android.settings.DEFAULT_WIDGET";
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124;
     private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125;
-    private static final int REQUEST_PICK_USER_SELECTED_APPWIDGET = 126;
-    private static final int REQUEST_PICK_STATUS_APPWIDGET = 127;
-    private static final int REQUEST_CREATE_USER_SELECTED_APPWIDGET = 128;
-    private static final int REQUEST_CREATE_STATUS_APPWIDGET = 129;
+    private static final int REQUEST_PICK_APPWIDGET = 126;
+    private static final int REQUEST_CREATE_APPWIDGET = 127;
 
     // Misc Settings
     private static final String KEY_SIM_LOCK = "sim_lock";
@@ -220,47 +217,6 @@
             }
         }
 
-        Preference pickStatusWidget = root.findPreference(KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET);
-        if (pickStatusWidget != null) {
-            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
-            int appWidgetId = getStatusAppWidgetId();
-            if (appWidgetId == -1) {
-                pickStatusWidget.setSummary(getResources().getString(R.string.widget_default));
-            } else {
-                AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
-                if (appWidget != null) {
-                    pickStatusWidget.setSummary(appWidget.label);
-                }
-            }
-            // TEMP: disable this for now
-            PreferenceCategory security =
-                    (PreferenceCategory) root.findPreference(KEY_SECURITY_CATEGORY);
-            if (security != null) {
-                security.removePreference(pickStatusWidget);
-            }
-        }
-
-        Preference pickLockscreenWidget =
-                root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET);
-        if (pickLockscreenWidget != null) {
-            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
-            int appWidgetId = getUserSelectedAppWidgetId();
-            if (appWidgetId == -1) {
-                pickLockscreenWidget.setSummary(getResources().getString(R.string.widget_none));
-            } else {
-                AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
-                if (appWidget != null) {
-                    pickLockscreenWidget.setSummary(appWidget.label);
-                }
-            }
-            // TEMP: disable this for now
-            PreferenceCategory security =
-                    (PreferenceCategory) root.findPreference(KEY_SECURITY_CATEGORY);
-            if (security != null) {
-                security.removePreference(pickLockscreenWidget);
-            }
-        }
-
         // Append the rest of the settings
         addPreferencesFromResource(R.xml.security_settings_misc);
 
@@ -314,26 +270,6 @@
         return root;
     }
 
-    private int getStatusAppWidgetId() {
-        int appWidgetId = -1;
-        String appWidgetIdString = Settings.Secure.getString(
-                getContentResolver(), Settings.Secure.LOCK_SCREEN_STATUS_APPWIDGET_ID);
-        if (appWidgetIdString != null) {;
-            appWidgetId = (int) Integer.decode(appWidgetIdString);
-        }
-        return appWidgetId;
-    }
-
-    private int getUserSelectedAppWidgetId() {
-        int appWidgetId = -1;
-        String appWidgetIdString = Settings.Secure.getString(
-                getContentResolver(), Settings.Secure.LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID);
-        if (appWidgetIdString != null) {;
-            appWidgetId = (int) Integer.decode(appWidgetIdString);
-        }
-        return appWidgetId;
-    }
-
     private boolean isNonMarketAppsAllowed() {
         return Settings.Global.getInt(getContentResolver(),
                                       Settings.Global.INSTALL_NON_MARKET_APPS, 0) > 0;
@@ -555,11 +491,7 @@
         if (KEY_UNLOCK_SET_OR_CHANGE.equals(key)) {
             startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
                     SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
-        } else if (KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET.equals(key)) {
-            launchPickActivityIntent(AppWidgetProviderInfo.WIDGET_FEATURES_NONE,
-                    R.string.widget_none, 0, new ComponentName("", ""), EXTRA_NO_WIDGET,
-                    REQUEST_PICK_USER_SELECTED_APPWIDGET);
-        } else if (KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET.equals(key)) {
+        } else if (KEY_CHOOSE_LOCKSCREEN_WIDGET.equals(key)) {
             int defaultIconId;
             ComponentName clock = new ComponentName(
                     "com.google.android.deskclock", "com.android.deskclock.DeskClock");
@@ -568,9 +500,9 @@
             } catch (PackageManager.NameNotFoundException e) {
                 defaultIconId = 0;
             }
-            launchPickActivityIntent(AppWidgetProviderInfo.WIDGET_FEATURES_STATUS,
+            launchPickActivityIntent(AppWidgetProviderInfo.WIDGET_FEATURES_NONE,
                     R.string.widget_default, defaultIconId, clock, EXTRA_DEFAULT_WIDGET,
-                    REQUEST_PICK_STATUS_APPWIDGET);
+                    REQUEST_PICK_APPWIDGET);
         } else if (KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING.equals(key)) {
             ChooseLockSettingsHelper helper =
                     new ChooseLockSettingsHelper(this.getActivity(), this);
@@ -651,57 +583,45 @@
             // is called by grabbing the value from lockPatternUtils.  We can't set it here
             // because mBiometricWeakLiveliness could be null
             return;
-        } else if (requestCode == REQUEST_PICK_USER_SELECTED_APPWIDGET ||
-                requestCode == REQUEST_PICK_STATUS_APPWIDGET ||
-                requestCode == REQUEST_CREATE_USER_SELECTED_APPWIDGET ||
-                requestCode == REQUEST_CREATE_STATUS_APPWIDGET) {
+        } else if (requestCode == REQUEST_PICK_APPWIDGET || requestCode == REQUEST_CREATE_APPWIDGET) {
             int appWidgetId = (data == null) ? -1 : data.getIntExtra(
                     AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
-            if ((requestCode == REQUEST_PICK_USER_SELECTED_APPWIDGET ||
-                 requestCode == REQUEST_PICK_STATUS_APPWIDGET) &&
+            if ((requestCode == REQUEST_PICK_APPWIDGET) &&
                 resultCode == Activity.RESULT_OK) {
                 AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
-                boolean defaultOrNoWidget = data.getBooleanExtra(EXTRA_NO_WIDGET, false) ||
-                        data.getBooleanExtra(EXTRA_DEFAULT_WIDGET, false);
+                boolean defaultWidget = data.getBooleanExtra(EXTRA_DEFAULT_WIDGET, false);
 
                 AppWidgetProviderInfo appWidget = null;
-                if (!defaultOrNoWidget) {
+                if (!defaultWidget) {
                     appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
                 }
 
-                int newRequestCode = requestCode == REQUEST_PICK_USER_SELECTED_APPWIDGET ?
-                    REQUEST_CREATE_USER_SELECTED_APPWIDGET :
-                    REQUEST_CREATE_STATUS_APPWIDGET;
-                if (!defaultOrNoWidget && appWidget.configure != null) {
+                if (!defaultWidget && appWidget.configure != null) {
                     // Launch over to configure widget, if needed
                     Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE);
                     intent.setComponent(appWidget.configure);
                     intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
 
-                    startActivityForResultSafely(intent, newRequestCode);
+                    startActivityForResultSafely(intent, REQUEST_CREATE_APPWIDGET);
                 } else {
                     // Otherwise just add it
-                    if (defaultOrNoWidget) {
+                    if (defaultWidget) {
                         // If we selected "none", delete the allocated id
                         AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
-                        data.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
+                        data.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
+                                LockPatternUtils.ID_DEFAULT_STATUS_WIDGET);
                     }
-                    onActivityResult(newRequestCode, Activity.RESULT_OK, data);
+                    onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data);
                 }
-            } else if ((requestCode == REQUEST_CREATE_USER_SELECTED_APPWIDGET ||
-                        requestCode == REQUEST_CREATE_STATUS_APPWIDGET) &&
-                       resultCode == Activity.RESULT_OK) {
-                // If a widget existed before, delete it
-                int oldAppWidgetId = requestCode == REQUEST_CREATE_USER_SELECTED_APPWIDGET ?
-                        getUserSelectedAppWidgetId() : getStatusAppWidgetId();
-                if (oldAppWidgetId != -1) {
-                    AppWidgetHost.deleteAppWidgetIdForSystem(oldAppWidgetId);
+            } else if (requestCode == REQUEST_CREATE_APPWIDGET && resultCode == Activity.RESULT_OK) {
+                mLockPatternUtils.addAppWidget(appWidgetId, 0);
+
+                IBinder b = ServiceManager.getService(Context.WINDOW_SERVICE);
+                IWindowManager iWm = IWindowManager.Stub.asInterface(b);
+                try {
+                    iWm.lockNow(null);
+                } catch (RemoteException e) {
                 }
-                Settings.Secure.putString(getContentResolver(),
-                        (requestCode == REQUEST_CREATE_USER_SELECTED_APPWIDGET ?
-                                Settings.Secure.LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID :
-                                Settings.Secure.LOCK_SCREEN_STATUS_APPWIDGET_ID),
-                        Integer.toString(appWidgetId));
             } else {
                 AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
             }
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 14a1083..7e461711 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -72,8 +72,9 @@
     private static final String KEY_NOTIFICATION_SOUND = "notification_sound";
     private static final String KEY_CATEGORY_CALLS = "category_calls_and_notification";
     private static final String KEY_DOCK_CATEGORY = "dock_category";
-    private static final String KEY_AUDIO_SETTINGS = "dock_audio";
+    private static final String KEY_DOCK_AUDIO_SETTINGS = "dock_audio";
     private static final String KEY_DOCK_SOUNDS = "dock_sounds";
+    private static final String KEY_DOCK_AUDIO_MEDIA_ENABLED = "dock_audio_media_enabled";
 
     private static final String[] NEED_VOICE_CAPABILITY = {
             KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
@@ -99,6 +100,7 @@
     private Preference mDockAudioSettings;
     private CheckBoxPreference mDockSounds;
     private Intent mDockIntent;
+    private CheckBoxPreference mDockAudioMediaEnabled;
 
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
@@ -306,17 +308,32 @@
             int dockState = mDockIntent != null
                     ? mDockIntent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0)
                     : Intent.EXTRA_DOCK_STATE_UNDOCKED;
+
             if (dockState == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
                 showDialog(DIALOG_NOT_DOCKED);
             } else {
-                Intent i = new Intent(mDockIntent);
-                i.setAction(DockEventReceiver.ACTION_DOCK_SHOW_UI);
-                i.setClass(getActivity(), DockEventReceiver.class);
-                getActivity().sendBroadcast(i);
+                boolean isBluetooth = mDockIntent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) != null;
+
+                if (isBluetooth) {
+                    Intent i = new Intent(mDockIntent);
+                    i.setAction(DockEventReceiver.ACTION_DOCK_SHOW_UI);
+                    i.setClass(getActivity(), DockEventReceiver.class);
+                    getActivity().sendBroadcast(i);
+                } else {
+                    PreferenceScreen ps = (PreferenceScreen)mDockAudioSettings;
+                    Bundle extras = ps.getExtras();
+                    extras.putBoolean("checked",
+                            Settings.Global.getInt(getContentResolver(),
+                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1);
+                    super.onPreferenceTreeClick(ps, ps);
+                }
             }
         } else if (preference == mDockSounds) {
             Settings.Global.putInt(getContentResolver(), Settings.Global.DOCK_SOUNDS_ENABLED,
                     mDockSounds.isChecked() ? 1 : 0);
+        } else if (preference == mDockAudioMediaEnabled) {
+            Settings.Global.putInt(getContentResolver(), Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,
+                    mDockAudioMediaEnabled.isChecked() ? 1 : 0);
         }
         return true;
     }
@@ -346,20 +363,20 @@
     }
 
     private void initDockSettings() {
+        ContentResolver resolver = getContentResolver();
+
         if (needsDockSettings()) {
-
-            ContentResolver resolver = getContentResolver();
-
-            mDockAudioSettings = findPreference(KEY_AUDIO_SETTINGS);
-
             mDockSounds = (CheckBoxPreference) findPreference(KEY_DOCK_SOUNDS);
             mDockSounds.setPersistent(false);
             mDockSounds.setChecked(Settings.Global.getInt(resolver,
                     Settings.Global.DOCK_SOUNDS_ENABLED, 0) != 0);
+            mDockAudioSettings = findPreference(KEY_DOCK_AUDIO_SETTINGS);
+            mDockAudioSettings.setEnabled(false);
         } else {
             getPreferenceScreen().removePreference(findPreference(KEY_DOCK_CATEGORY));
-            getPreferenceScreen().removePreference(findPreference(KEY_AUDIO_SETTINGS));
+            getPreferenceScreen().removePreference(findPreference(KEY_DOCK_AUDIO_SETTINGS));
             getPreferenceScreen().removePreference(findPreference(KEY_DOCK_SOUNDS));
+            Settings.Global.putInt(resolver, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 1);
         }
     }
 
@@ -367,15 +384,10 @@
         if (mDockAudioSettings != null) {
             int dockState = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0);
 
-            boolean isBluetooth = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) != null;
+            boolean isBluetooth =
+                    intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) != null;
 
-            if (!isBluetooth) {
-                // No dock audio if not on Bluetooth.
-                mDockAudioSettings.setEnabled(false);
-            } else {
-                mDockAudioSettings.setEnabled(true);
-                mDockIntent = intent;
-            }
+            mDockIntent = intent;
 
             if (dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
                 // remove undocked dialog if currently showing.
@@ -384,6 +396,30 @@
                 } catch (IllegalArgumentException iae) {
                     // Maybe it was already dismissed
                 }
+
+                if (isBluetooth) {
+                    mDockAudioSettings.setEnabled(true);
+                } else {
+                    if (dockState == Intent.EXTRA_DOCK_STATE_LE_DESK) {
+                        ContentResolver resolver = getContentResolver();
+                        mDockAudioSettings.setEnabled(true);
+                        if (Settings.Global.getInt(resolver,
+                                Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, -1) == -1) {
+                            Settings.Global.putInt(resolver,
+                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0);
+                        }
+                        mDockAudioMediaEnabled =
+                                (CheckBoxPreference) findPreference(KEY_DOCK_AUDIO_MEDIA_ENABLED);
+                        mDockAudioMediaEnabled.setPersistent(false);
+                        mDockAudioMediaEnabled.setChecked(
+                                Settings.Global.getInt(resolver,
+                                        Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) != 0);
+                    } else {
+                        mDockAudioSettings.setEnabled(false);
+                    }
+                }
+            } else {
+                mDockAudioSettings.setEnabled(false);
             }
         }
     }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 07f6716..6d76bed 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -20,6 +20,7 @@
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -46,9 +47,13 @@
 import android.preference.PreferenceActivity.Header;
 import android.preference.PreferenceFrameLayout;
 import android.preference.PreferenceGroup;
+import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Profile;
+import android.provider.ContactsContract.RawContacts;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -487,22 +492,78 @@
         return true;
     }
 
-    public static String getMeProfileName(Context context) {
-        Cursor cursor = context.getContentResolver().query(
-                    Profile.CONTENT_URI, new String[] {Phone._ID, Phone.DISPLAY_NAME},
-                    null, null, null);
-        if (cursor == null) {
-            return null;
+    public static String getMeProfileName(Context context, boolean full) {
+        if (full) {
+            return getProfileDisplayName(context);
+        } else {
+            return getShorterNameIfPossible(context);
         }
+    }
+
+    private static String getShorterNameIfPossible(Context context) {
+        final String given = getLocalProfileGivenName(context);
+        return !TextUtils.isEmpty(given) ? given : getProfileDisplayName(context);
+    }
+
+    private static String getLocalProfileGivenName(Context context) {
+        final ContentResolver cr = context.getContentResolver();
+
+        // Find the raw contact ID for the local ME profile raw contact.
+        final long localRowProfileId;
+        final Cursor localRawProfile = cr.query(
+                Profile.CONTENT_RAW_CONTACTS_URI,
+                new String[] {RawContacts._ID},
+                RawContacts.ACCOUNT_TYPE + " IS NULL AND " +
+                        RawContacts.ACCOUNT_NAME + " IS NULL",
+                null, null);
+        if (localRawProfile == null) return null;
 
         try {
-            if (cursor.moveToFirst()) {
-                return cursor.getString(cursor.getColumnIndex(Phone.DISPLAY_NAME));
+            if (!localRawProfile.moveToFirst()) {
+                return null;
             }
+            localRowProfileId = localRawProfile.getLong(0);
         } finally {
-            cursor.close();
+            localRawProfile.close();
         }
-        return null;
+
+        // Find the structured name for the raw contact.
+        final Cursor structuredName = cr.query(
+                Profile.CONTENT_URI.buildUpon().appendPath(Contacts.Data.CONTENT_DIRECTORY).build(),
+                new String[] {CommonDataKinds.StructuredName.GIVEN_NAME,
+                    CommonDataKinds.StructuredName.FAMILY_NAME},
+                Data.RAW_CONTACT_ID + "=" + localRowProfileId,
+                null, null);
+        if (structuredName == null) return null;
+
+        try {
+            if (!structuredName.moveToFirst()) {
+                return null;
+            }
+            String partialName = structuredName.getString(0);
+            if (TextUtils.isEmpty(partialName)) {
+                partialName = structuredName.getString(1);
+            }
+            return partialName;
+        } finally {
+            structuredName.close();
+        }
+    }
+
+    private static final String getProfileDisplayName(Context context) {
+        final ContentResolver cr = context.getContentResolver();
+        final Cursor profile = cr.query(Profile.CONTENT_URI,
+                new String[] {Profile.DISPLAY_NAME}, null, null, null);
+        if (profile == null) return null;
+
+        try {
+            if (!profile.moveToFirst()) {
+                return null;
+            }
+            return profile.getString(0);
+        } finally {
+            profile.close();
+        }
     }
 
     /** Not global warming, it's global change warning. */
diff --git a/src/com/android/settings/users/ProfileUpdateReceiver.java b/src/com/android/settings/users/ProfileUpdateReceiver.java
index 88daa58..955ee4d 100644
--- a/src/com/android/settings/users/ProfileUpdateReceiver.java
+++ b/src/com/android/settings/users/ProfileUpdateReceiver.java
@@ -53,7 +53,7 @@
 
         int userId = UserHandle.myUserId();
         UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        String profileName = Utils.getMeProfileName(context);
+        String profileName = Utils.getMeProfileName(context, false /* partial name */);
         if (profileName != null && profileName.length() > 0) {
             um.setUserName(userId, profileName);
             // Flag that we've written the profile one time at least. No need to do it in the future.
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 984ac08..632dfe5 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -503,7 +503,7 @@
     }
 
     private String getProfileName() {
-        String name = Utils.getMeProfileName(getActivity());
+        String name = Utils.getMeProfileName(getActivity(), true);
         if (name != null) {
             mProfileExists = true;
         }