Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5194361f9867c10dfac1f4acf733c91d95ff9f38
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4db1996..4f46320 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gas"</string>
     <string name="user_switch" msgid="6544839750534690781">"Wissel"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Jy (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profielinligting"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Naam"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nie opgestel nie"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Wysig gebruikernaam"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Gebruikers en rekeninge"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Gebruiker"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Rekeninge van <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Herprobeer"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Slaan oor"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Stel \'n skermslot"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Kies jou patroon"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Huidige skermslot"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Stel \'n patroon vir sekuriteit"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Vee uit"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Verwyder skermslot?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Dit sal enigiemand toegang tot jou rekening gee"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Voer jou PIN in"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Voer jou wagwoord in"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Stel \'n PIN vir sekuriteit"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Voer jou PIN weer in"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN moet minstens 4 syfers hê"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN is ongeldig; moet minstens 4 syfers bevat."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN\'e stem nie ooreen nie"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Kon nie PIN stoor nie"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Verkeerde PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Verkeerde wagwoord"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Stel \'n wagwoord vir sekuriteit"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Voer jou wagwoord weer in"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Wagwoorde stem nie ooreen nie"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Kanselleer"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace-sleutel"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter-sleutel"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Verlaat demonstrasie?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"\'n Fabriekterugstelling word vereis om die demonstrasierekening uit te vee en demonstrasiemodus te verlaat"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Verlaat demonstrasie"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Verlaat demonstrasiemodus"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Dit sal die demonstrasierekening uitvee en \'n fabriekterugstelling op die stelsel uitvoer. Alle gebruikerdata sal verloor word."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Verlaat demonstrasie"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"voltooi opstelling"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"nie nou nie"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Handeling nie beskikbaar terwyl jy bestuur nie."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9f23bf0..9ce01bb 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"እንግዳ"</string>
     <string name="user_switch" msgid="6544839750534690781">"ቀይር"</string>
     <string name="current_user_name" msgid="3813671533249316823">"እርስዎ (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"የመገለጫ መረጃ"</string>
     <string name="user_name_label" msgid="3210832645046206845">"ስም"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"አልተዋቀረም"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"የተጠቃሚ ስም አርትዕ ያድርጉ"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ተጠቃሚዎች እና መለያዎች"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ተጠቃሚ"</string>
     <string name="account_list_title" msgid="7631588514613843065">"የ<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> መለያዎች"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"እንደገና ይሞክሩ"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"ዝለል"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"የማያ ገጽ መቆለፊያን ያቀናብሩ"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"የእርስዎን ሥርዓተ ጥለት ይምረጡ"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"አሁን ያለ ማያ ገጽ መቆለፊያ"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"ለደህንነት ሲባል፣ ሥርዓተ ጥለትን ያቀናብሩ"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"አጽዳ"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"እሺ"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"ማያ ገጽ ቆላፊ ይወገድ?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"ይህ ማንም የፈለገ ሰው የእርስዎን መለያ እንዲደርስበት ይፈቅዳል"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"የእርስዎን ፒን ያስገቡ"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"ይለፍ ቃልዎን ያስገቡ"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"ለደህንነት አንድ ፒን ያቀናብሩ"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"የእርስዎን ፒን ደግመው ያስገቡ"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"ፒን ቢያንስ 4 አሃዞች መሆን አለበት"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"ፒን ልክ ያልሆነ ነው፣ ቢያንስ 4 አኃዞች መሆን አለበት።"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"ፒኖች አይዛመዱም"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"ፒን ማስቀመጥ ላይ ስህተት"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"የተሳሳተ ፒን"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"የተሳሳተ የይለፍ ቃል"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"ለደህንነት የይለፍ ቃል ያቀናብሩ"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"የእርስዎን ይለፍ ቃል ደግመው ያስገቡ"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"የይለፍ ቃላት አይዛመዱም"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"ይቅር"</string>
     <string name="backspace_key" msgid="1545590866688979099">"የBackspace ቁልፍ"</string>
     <string name="enter_key" msgid="2121394305541579468">"ቁልፍ አስገባ"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ከማሳያ ይውጡ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"የማሳያ መለያውን እና የነባር ማሳያ ሁነታን ለመሰረዝ የፋብሪካ ዳግም ማስጀመር ያስፈልጋል"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ከማሳያ ውጣ"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ከልምምድ ሁነታ ውጣ"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ይህ የልምምድ መለያውን እና የፋብሪካ ዳግም አስጀምር ሥርዓቱን ይሰርዛል። ሁሉም የተጠቃሚ ውሂብ ይጠፋል።"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ከማሳያ ውጣ"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ማዋቀር ጨርስ"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"አሁን አልፈልግም"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"በመንዳት ጊዜ እርምጃው አይገኝም።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8d8878c..b79541f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -98,7 +98,7 @@
     <string name="notification_volume_title" msgid="6749411263197157876">"الإشعار"</string>
     <string name="media_volume_title" msgid="6697416686272606865">"الوسائط"</string>
     <string name="media_volume_summary" msgid="2961762827637127239">"تعيين مستوى الصوت للموسيقى والفيديوهات"</string>
-    <string name="alarm_volume_title" msgid="840384014895796587">"المنبه"</string>
+    <string name="alarm_volume_title" msgid="840384014895796587">"المنبّه"</string>
     <string name="applications_settings" msgid="794261395191035632">"معلومات التطبيق"</string>
     <string name="disable_text" msgid="4358165448648990820">"إيقاف"</string>
     <string name="enable_text" msgid="1794971777861881238">"تفعيل"</string>
@@ -177,9 +177,9 @@
     <string name="user_guest" msgid="3465399481257448601">"الضيف"</string>
     <string name="user_switch" msgid="6544839750534690781">"تبديل"</string>
     <string name="current_user_name" msgid="3813671533249316823">"أنت (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"معلومات الملف الشخصي"</string>
     <string name="user_name_label" msgid="3210832645046206845">"الاسم"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"لم يتم الإعداد."</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"تعديل اسم المستخدم"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"المستخدمون والحسابات"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"المستخدم"</string>
     <string name="account_list_title" msgid="7631588514613843065">"حسابات <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -211,6 +211,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"إعادة المحاولة"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"تخطّي"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"تعيين قفل شاشة"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"اختيار النّقش"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"قفل الشاشة الحالي"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"للحفاظ على الأمان، يجب تعيين نقش."</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"محو"</string>
@@ -227,12 +228,16 @@
     <string name="okay" msgid="4589873324439764349">"موافق"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"هل تريد إزالة قفل الشاشة؟"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"سيؤدي هذا الإجراء إلى السماح لأي شخص بالدخول إلى حسابك."</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"أدخل رقم التعريف الشخصي"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"أدخل كلمة المرور"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"للحفاظ على الأمان، يجب تعيين رقم PIN."</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"إعادة إدخال رقم التعريف الشخصي"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"يجب أن يكون رقم PIN‏ 4 أرقام على الأقل."</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"رقم التعريف الشخصي غير صالح لأنه يجب أن يحتوي على 4 أرقام على الأقل."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"أرقام PIN غير متطابقة"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"حدث خطأ أثناء حفظ رقم التعريف الشخصي."</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"رقم تعريف شخصي خاطئ"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"كلمة مرور غير صحيحة"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"للحفاظ على الأمان، يجب تعيين كلمة مرور."</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"إعادة إدخال كلمة المرور"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"كلمات المرور غير متطابقة"</string>
@@ -308,8 +313,10 @@
     <string name="cancel" msgid="750286395700355455">"إلغاء"</string>
     <string name="backspace_key" msgid="1545590866688979099">"مفتاح Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"مفتاح Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"أتريد إنهاء العرض توضيحي؟"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"سيتطلب حذف حساب العرض التوضيحي والخروج من وضع العرض التوضيحي إجراء إعادة الضبط بحسب إعدادات المصنع."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"خروج من عرض توضيحي"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"خروج من وضع العرض التوضيحي"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"سيؤدي هذا إلى حذف حساب العرض التوضيحي وإعادة الضبط بحسب بيانات المصنع على النظام. سيتم فقد جميع بيانات المستخدم."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"خروج من عرض توضيحي"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"الانتهاء من الإعداد"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ليس الآن"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"الإجراء غير متاح أثناء القيادة."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 1dd607f..c039135 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"অতিথি"</string>
     <string name="user_switch" msgid="6544839750534690781">"ছুইচ্চ"</string>
     <string name="current_user_name" msgid="3813671533249316823">"আপুনি (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"প্ৰ\'ফাইলৰ তথ্য"</string>
     <string name="user_name_label" msgid="3210832645046206845">"নাম"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"ছেট আপ কৰা হোৱা নাই"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ব্যৱহাৰকাৰী আৰু একাউণ্টবোৰ"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ব্যৱহাৰকাৰী"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>ৰ একাউণ্ট"</string>
@@ -210,6 +211,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"পুনৰ চেষ্টা কৰক"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"এৰি যাওক"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"স্ক্ৰীণ ছেট কৰক"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"আপোনাৰ আৰ্হি বাছক"</string>
     <!-- no translation found for current_screen_lock (637651611145979587) -->
     <skip />
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"সুৰক্ষাৰ বাবে কোনো আৰ্হি ছেট কৰক"</string>
@@ -229,12 +231,16 @@
     <skip />
     <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
     <skip />
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"আপোনাৰ পিন দিয়ক"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"আপোনাৰ পাছৱৰ্ড দিয়ক"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"সুৰক্ষাৰ বাবে কোনো পিন ছেট কৰক"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"আপোনাৰ পিনটো আকৌ দিয়ক"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"পিনটোত কমেও ৪টা অংক থাকিব লাগিব"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"অমান্য় পিন, কমেও ৪টা সংখ্য়া হ\'ব লাগিব।"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"পিনবিলাক মিলা নাই"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"পিন ছেভ কৰোঁতে আঁসোৱাহ"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"ভুল পিন"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"ভুল পাছৱৰ্ড"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"সুৰক্ষাৰ বাবে কোনো পাছৱৰ্ড ছেট কৰক"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"আপোনাৰ পাছৱৰ্ড আকৌ দিয়ক"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"পাছৱৰ্ড মিলা নাই"</string>
@@ -286,8 +292,10 @@
     <string name="cancel" msgid="750286395700355455">"বাতিল কৰক"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace কী"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter কী"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ডেম\'ৰ পৰা বাহিৰ হ\'বনে?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ডেম\' একাউণ্ট মচিবলৈ আৰু ডেম\' ম\'ডৰ পৰা বাহিৰলৈ ওলাবলৈ ফেক্টৰী ৰিছেট কৰাৰ প্ৰয়োজন হ\'ব"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ডেম\'ৰ পৰা বাহিৰ হওক"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ডেম\' ম\'ডৰ পৰা বাহিৰ হওক"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"এই কামে ডেম\' একাউণ্টটো মচি পেলাব আৰু ছিষ্টেমটোৰ ফেক্টৰী ডেটা ৰিছেট কৰিব। সকলো ব্যৱহাৰকাৰীৰ ডেটা হেৰাব।"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ডেম\'ৰ পৰা বাহিৰ হওক"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ছেট আপ সমাপ্ত কৰক"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"এতিয়াই নহয়"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"গাড়ী চলোৱা সময়ত কাৰ্যটো উপলব্ধ নাথাকে।"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index f03c355..0466f97 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Qonaq"</string>
     <string name="user_switch" msgid="6544839750534690781">"Dəyişin"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Siz (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profil məlumatı"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Ad"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Quraşdırılmayıb"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"İstifadəçi adını redaktə edin"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"İstifadəçilər və hesablar"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"İstifadəçi"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> üçün hesablar"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Yenidən cəhd edin"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Keçin"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ekran kilidi təyin edin"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Modelinizi seçin"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Cari ekran kilidi"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Təhlükəsizlik üçün model təyin edin"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Silin"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Ekran kilidi ləğv edilsin?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Bu, hər kəsə hesabınıza daxil olmaq imkanı verəcək"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN kodu daxil edin"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Şifrənizi daxil edin"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Təhlükəsizlik üçün PIN kod təyin edin"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"PIN kodu yenidən daxil edin"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN ən az 4 rəqəmdən ibarət olmalıdır"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pın kod yanlışdır, ən azı 4 rəqəm olmalıdır."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN kodlar uyğun gəlmir"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN kodu saxlamaqla bağlı problem var"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Yanlış PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Yanlış parol"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Təhlükəsizlik üçün parol təyin edin"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Parolunuzu yenidən daxil edin"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Parollar uyğun gəlmir"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Ləğv edin"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace düyməsi"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter düyməsi"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Demodan çıxılsın?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Demo hesabın silinməsi və demo rejimdən çıxma zavod ayarlarının bərpasını tələb edəcək"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Demodan çıxın"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Demo rejimdən çıxın"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Bu, demo hesabı siləcək və sistemi istehsalçı nizamlarına qaytaracaq."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demodan çıxın"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"quraşdırmanı bitirin"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"indi yox"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Əməliyyat avtomobil idarə edərkən əlçatan deyil."</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d5e3b71..d3df9e0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -174,9 +174,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gost"</string>
     <string name="user_switch" msgid="6544839750534690781">"Prebacite na drugog korisnika"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Vi (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Podaci o profilu"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Ime"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nije podešeno"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Izmenite ime korisnika"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Korisnici i nalozi"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Korisnik"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Nalozi za korisnika <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -208,6 +208,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Probaj ponovo"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Preskoči"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Podesite zaključavanje ekrana"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Odaberite šablon"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Trenutno zaključavanje ekrana"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Podesite šablon iz bezbednosnih razloga"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Obriši"</string>
@@ -224,12 +225,16 @@
     <string name="okay" msgid="4589873324439764349">"Potvrdi"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Želite li da ukl. zak. ekrana?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Ovim ćete dozvoliti svima pristup vašem nalogu"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Unesite PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Unesite lozinku"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Podesite PIN iz bezbednosnih razloga"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Ponovo unesite PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN mora da sadrži najmanje 4 cifre"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN je nevažeći, mora da sadrži najmanje 4 cifre."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-ovi se ne podudaraju"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Greška pri čuvanju PIN-a"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Pogrešan PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Pogrešna lozinka"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Podesite lozinku iz bezbednosnih razloga"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Ponovo unesite lozinku"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Lozinke se ne podudaraju"</string>
@@ -287,8 +292,10 @@
     <string name="cancel" msgid="750286395700355455">"Otkaži"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Taster za brisanje unazad"</string>
     <string name="enter_key" msgid="2121394305541579468">"Taster Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Nap. rež. demonstracije?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Za brisanje naloga za dem. i izlazak iz režima demo. je potrebno resetovanje na fabrička podešavanja"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Napustite režim demonstr."</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Da napustite režim dem.?"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ovim ćete izbrisati nalog za demonstracije i resetovati sistem na fabrička podešavanja. Svi podaci korisnika će biti izgubljeni."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Napusti režim demonstr."</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"završite podešavanje"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ne sada"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Radnja nije dostupna tokom vožnje."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 22e2a8a..ba73a2c 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Госць"</string>
     <string name="user_switch" msgid="6544839750534690781">"Пераключыцца"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Вы (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Звесткі профілю"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Імя"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Не наладжана"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Змяніць імя карыстальніка"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Карыстальнікі і ўл. запісы"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Карыстальнік"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Уліковыя запісы карыстальніка <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Паўтарыць"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Прапусціць"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Задайце блакіроўку экрана"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Выберыце шаблон"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Бягучая блакіроўка экрана"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Задайце ўзор, каб абараніць прыладу"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Выдаліць"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"ОК"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Зняць блакіроўку экрана?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Доступ да вашага ўліковага запісу атрымае любы карыстальнік"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Увядзіце PIN-код"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Увядзіце пароль"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Задайце PIN-код, каб абараніць прыладу"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Увядзіце PIN-код яшчэ раз"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-код павінен мець мінімум 4 лічбы"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Памылка. PIN-код павінен складацца мінімум з 4 лічбаў."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-коды не супадаюць"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Памылка захавання PIN-кода"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Няправільны PIN-код"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Няправільны пароль"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Задайце пароль, каб абараніць прыладу"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Увядзіце пароль яшчэ раз"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Паролі не супадаюць"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"Скасаваць"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Клавіша Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Клавіша Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Выйсці з дэмарэжыму?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Каб выдаліць тэставы ўліковы запіс і выйсці з дэма-рэжыму, трэба скінуць прыладу да заводскіх налад"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Выйсці з дэма-рэжыму"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Выйсці з дэма-рэжыму"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Адбудзецца скід сістэмы да заводскіх налад. Тэставы ўліковы запіс і ўсе карыстальніцкія даныя будуць выдалены."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Выйсці з дэма-рэжыму"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"завяршыць наладку"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"не зараз"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Дзеянне недаступнае, калі вы за рулём."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 367323f..42c5f66 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Гост"</string>
     <string name="user_switch" msgid="6544839750534690781">"Превключване"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Вие (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Инфор. за потреб. профил"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Име"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Не е настроен"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Редактиране на потребит. име"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Потребители и профили"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Потребител"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Профили за <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Нов опит"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Пропускане"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Задайте опция за заключване на екрана"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Изберете фигурата си"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Текуща опция за заключване на екрана"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"За по-голяма сигурност задайте фигура"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Изчистване"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"ОK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Премахване на закл. на екрана?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Така ще разрешите на всеки да има достъп до профила ви"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Въведете ПИН кода си"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Въведете паролата си"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"От съображения за сигурност задайте ПИН"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Въведете отново ПИН кода си"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"ПИН кодът трябва да съдържа поне 4 цифри"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"ПИН кодът е невалиден – трябва да е поне 4 цифри."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"ПИН кодовете не са идентични"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Грешка при запазването на ПИН кода"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Грешен ПИН код"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Грешна парола"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"За по-голяма сигурност задайте парола"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Въведете отново паролата си"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Паролите не са идентични"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Отказ"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Клавиш „Backspace“"</string>
     <string name="enter_key" msgid="2121394305541579468">"Въведете ключа"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Изход от демонстр. режим?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"За изтрив. на демонстр. профил и за изход от демонстр. режим ще се изисква възст. на фабр. настройки"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Демонстр. режим: Изход"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Изход от демонстр. режим"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Това действие ще изтрие демонстрационния профил и ще възстанови фабричните настройки на системата. Всички потребителски данни ще бъдат изгубени."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Демонстр. режим: Изход"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"завършване на настройването"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"не сега"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Действието не е налице по време на шофиране."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f0e9bb2..7129065 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"অতিথি"</string>
     <string name="user_switch" msgid="6544839750534690781">"পরিবর্তন করুন"</string>
     <string name="current_user_name" msgid="3813671533249316823">"আপনি (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"প্রোফাইল তথ্য"</string>
     <string name="user_name_label" msgid="3210832645046206845">"নাম"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"সেট-আপ করা নেই"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ব্যবহারকারী ও অ্যাকাউন্ট"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ব্যবহারকারী"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> এর অ্যাকাউন্ট"</string>
@@ -194,24 +195,21 @@
     <string name="user_add_user_message_update" msgid="1528170913388932459">"যেকোনও ব্যবহারকারী বাকি সব ব্যবহারকারীর জন্য অ্যাপ আপডেট করতে পারবেন।"</string>
     <string name="security_settings_title" msgid="6955331714774709746">"নিরাপত্তা"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"স্ক্রিন লক"</string>
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"কোনওটিই নয়"</string>
     <string name="security_lock_pattern" msgid="1174352995619563104">"প্যাটার্ন"</string>
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"পিন"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"পাসওয়ার্ড"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"লকের একটি ধরন বেছে নিন"</string>
     <string name="screen_lock_options" msgid="7023338635352915768">"স্ক্রিন লকের বিকল্প"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"প্যাটার্ন আঁকুন"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"নিশ্চিত করুন"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"আবার আঁকুন"</string>
     <string name="continue_button_text" msgid="5129979170426836641">"চালিয়ে যান"</string>
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"আবার চেষ্টা করুন"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"এড়িয়ে যান"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"একটি স্ক্রিন লক সেট করুন"</string>
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"আপনার প্যাটার্ন বেছে নিন"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"বর্তমান স্ক্রিন লক"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"নিরাপত্তার জন্য একটি প্যাটার্ন সেট করুন"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"সরান"</string>
     <string name="lockpattern_cancel_button_text" msgid="4068764595622381766">"বাতিল করুন"</string>
@@ -225,16 +223,18 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"কীভাবে একটি আনলক প্যাটার্ন আঁকবেন"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"প্যাটার্ন সেভ করার সময় সমস্যা"</string>
     <string name="okay" msgid="4589873324439764349">"ঠিক আছে"</string>
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
-    <skip />
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"স্ক্রিন লক সরিয়ে দেবেন?"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"এর ফলে যেকেউ আপনার অ্যাকাউন্ট অ্যাক্সেস করতে পারবেন"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"পিন লিখুন"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"পাসওয়ার্ড লিখুন"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"নিরাপত্তার জন্য একটি পিন সেট করুন"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"আপনার পিনটি আবার লিখুন"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"পিন অবশ্যই ন্যূনতম ৪ সংখ্যার হতে হবে"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"এই পিনটি ব্যবহার করা যাবে না, এতে অন্তত ৪টি সংখ্যা থাকতে হবে।"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"পিনগুলি মিলছে না"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"পিন সেভ করার সময় সমস্যা"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"ভুল পিন"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"ভুল পাসওয়ার্ড"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"নিরাপত্তার জন্য একটি পাসওয়ার্ড সেট করুন"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"আপনার পাসওয়ার্ডটি আবার লিখুন"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"পাসওয়ার্ডগুলি মিলছে না"</string>
@@ -286,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"বাতিল করুন"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace বোতাম"</string>
     <string name="enter_key" msgid="2121394305541579468">"বোতাম টিপুন"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ডেমো মোড ছেড়ে যাবেন?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ডেমো অ্যাকাউন্ট মুছতে এবং ডেমো মোড ছেড়ে যেতে হলে ফ্যাক্টরি রিসেট করতে হবে"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ডেমো মোড ছেড়ে যান"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ডেমো মোড ছেড়ে বেরিয়ে আসুন"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"এর ফলে ডেমো অ্যাকাউন্টটি মুছে দেওয়া হবে এবং সিস্টেমের ডেটা ফ্যাক্টরি রিসেট করা হবে। ব্যবহারকারীর সমস্ত ডেটা মুছে যাবে।"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ডেমো মোড ছেড়ে যান"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"সেট-আপ শেষ করুন"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"এখনই নয়"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ড্রাইভ করার সময় এই কাজটি করা যাবে না।"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 58e2769..0d394b0 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -174,9 +174,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gost"</string>
     <string name="user_switch" msgid="6544839750534690781">"Prebaci"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Vi (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Podaci o profilu"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Ime"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nije postavljen"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Izmjena korisničkog imena"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Korisnici i računi"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Korisnik"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Računi za korisnika <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -208,6 +208,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Pokušaj ponovo"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Preskoči"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Postavljanje zaključavanja ekrana"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Odaberite uzorak"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Trenutni način zaključavanja ekrana"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Postavite uzorak radi sigurnosti"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Obriši"</string>
@@ -224,12 +225,16 @@
     <string name="okay" msgid="4589873324439764349">"UREDU"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Ukloniti zaključavanje ekrana?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Svi će imati pristup vašem računu"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Unesite svoj PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Unesite svoju lozinku"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Postavite PIN radi sigurnosti"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Ponovo unesite PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN mora sadržavati najmanje 4 cifre"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN kôd nije ispravan, mora imati najmanje 4 cifre."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN kôdovi se ne podudaraju"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Greška prilikom pohrane PIN-a"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Pogrešan PIN kôd"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Pogrešna lozinka"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Postavite lozinku radi sigurnosti"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Ponovo unesite lozinku"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Lozinke se ne podudaraju"</string>
@@ -287,8 +292,10 @@
     <string name="cancel" msgid="750286395700355455">"Otkaži"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tipka Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tipka Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Izaći iz demonstracije?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Brisanje računa za demonstr. i izlazak iz načina demonstr. zahtijeva vraćanje na fabričke postavke"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Izađite iz demonstr."</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Izađite iz načina demonstr."</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ovim će se izbrisati račun za demonstraciju i vratiti sistem na fabričke postavke. Svi korisnički podaci bit će izgubljeni."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Izađite iz demonstr."</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"dovrši postavljanje"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ne sada"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Radnja nije dostupna tokom vožnje."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a106961..64423e1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Convidat"</string>
     <string name="user_switch" msgid="6544839750534690781">"Canvia"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Tu (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informació de perfil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nom"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"No configurat"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Edita el nom d\'usuari"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Usuaris i comptes"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Usuari"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Comptes de l\'usuari <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Torna-ho a provar"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Omet"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Defineix un bloqueig de pantalla"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Tria el teu patró"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Bloqueig de pantalla actual"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Per seguretat, defineix un patró"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Esborra"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"D\'acord"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Suprimir bloqueig de pantalla?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Permetràs que qualsevol persona accedeixi al teu compte"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Introdueix el PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Introdueix la contrasenya"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Per seguretat, defineix un PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Torna a introduir el PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"El PIN ha de tenir 4 dígits com a mínim"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"El PIN no és vàlid. Ha de tenir com a mínim 4 dígits."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Els PIN no coincideixen"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"S\'ha produït un error en desar el PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"El PIN no és correcte"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"La contrasenya no és correcta"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Per seguretat, defineix una contrasenya"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Torna a introduir la contrasenya"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Les contrasenyes no coincideixen"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancel·la"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tecla de retrocés"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tecla de retorn"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Vols sortir de la demostració?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Si suprimeixes el compte i surts del mode de demostració, hauràs de restablir les dades de fàbrica."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Surt de la demostració"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Surt del mode de demostració"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Aquesta acció suprimirà el compte de demostració i es restabliran les dades de fàbrica del sistema. Es perdran totes les dades d\'usuari."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Surt de la demostració"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"finalitza la configuració"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ara no"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Aquesta acció no està disponible mentre condueixes."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a4c7691..9bceabf 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Host"</string>
     <string name="user_switch" msgid="6544839750534690781">"Přepnout"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Vy (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informace o profilu"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Jméno"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Není nastaveno"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Upravení uživatelského jména"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Uživatelé a účty"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Uživatel"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Účty uživatele <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Zkusit znovu"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Přeskočit"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Nastavení zámku obrazovky"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Vyberte gesto"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Aktuální zámek obrazovky"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Z bezpečnostních důvodů nastavte gesto"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Vymazat"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Odstranit zámek obrazovky?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Kdokoli bude mít přístup k vašemu účtu"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Zadejte PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Zadejte heslo"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Z bezpečnostních důvodů nastavte PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Znovu zadejte PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN musí mít alespoň čtyři číslice"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Kód PIN je neplatný, musí obsahovat alespoň čtyři číslice."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Kódy PIN se neshodují"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Při ukládání kódu PIN došlo k chybě"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Nesprávný PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Nesprávné heslo"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Z bezpečnostních důvodů nastavte heslo"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Znovu zadejte heslo"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Hesla se neshodují"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"Zrušit"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Klávesa Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Klávesa Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Ukončit ukázku?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Smazání ukázkového účtu a ukončení ukázkového režimu vyžaduje obnovení do továrního nastavení"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Ukončit ukázku"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Ukončení ukázkového režimu"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ukázkový účet bude smazán a systém se resetuje do továrního nastavení. Všechna uživatelská data budou ztracena."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Ukončit ukázku"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"dokončit nastavení"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"teď ne"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Akce při řízení není dostupná."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f830c46..2151241 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gæst"</string>
     <string name="user_switch" msgid="6544839750534690781">"Skift"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Dig (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profiloplysninger"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Navn"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Ikke konfigureret"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Rediger brugernavn"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Brugere og konti"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Bruger"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Konti for <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Prøv igen"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Spring over"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Konfigurer en skærmlås"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Vælg dit mønster"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Aktuel skærmlås"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Angiv et mønster af sikkerhedshensyn"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Ryd"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Vil du fjerne skærmlåsen?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Dette vil betyde, at alle kan få adgang til din konto"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Angiv din pinkode"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Angiv din adgangskode"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Angiv en pinkode af sikkerhedshensyn"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Angiv din pinkode igen"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Pinkoden skal indeholde mindst 4 tal"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pinkoden er ugyldig. Den skal indeholde mindst 4 tal."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Pinkoderne er ikke ens"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Pinkoden kunne ikke gemmes"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Forkert pinkode"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Forkert adgangskode"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Angiv en adgangskode af sikkerhedshensyn"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Angiv din adgangskode igen"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Adgangskoderne er ikke ens"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Annuller"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace-tast"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter-tast"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Skal demotilstand lukkes?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Hvis du vil slette demokontoen og lukke demotilstanden, skal du gendanne fabriksindstillingerne."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Luk demotilstand"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Luk demotilstand"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Denne handling sletter demokontoen og gendanner systemets fabriksdata. Du mister alle brugerdata."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Luk demotilstand"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"afslut konfiguration"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ikke nu"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Handlingen er ikke tilgængelig under kørsel."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index eb54855..b14deeb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gast"</string>
     <string name="user_switch" msgid="6544839750534690781">"Wechseln"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Du (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profilinformationen"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Name"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nicht eingerichtet"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Nutzername bearbeiten"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Nutzer &amp; Konten"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Nutzer"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Konten für <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Wiederholen"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Überspringen"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Displaysperre einrichten"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Muster wählen"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Aktuelle Displaysperre"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Richte zur Sicherheit ein Muster ein"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Löschen"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Displaysperre entfernen?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Dadurch können andere auf dein Konto zugreifen"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN eingeben"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Passwort eingeben"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Richte zur Sicherheit eine PIN ein"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"PIN noch einmal eingeben"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN muss mindestens 4-stellig sein"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN ungültig. Sie muss mindestens 4-stellig sein."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PINs stimmen nicht überein"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Fehler beim Speichern der PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Falsche PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Falsches Passwort"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Richte zur Sicherheit ein Passwort ein"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Passwort noch einmal eingeben"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Passwörter stimmen nicht überein"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Abbrechen"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Rücktaste"</string>
     <string name="enter_key" msgid="2121394305541579468">"Schlüssel eingeben"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Demomodus beenden?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Zurücksetzen auf die Werkseinstellungen zum Löschen des Demokontos und Beenden des Demomodus nötig"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Demo beenden"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Demomodus beenden"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Dadurch wird das Demokonto gelöscht und das System auf die Werkseinstellungen zurückgesetzt. Dabei gehen alle Nutzerdaten verloren."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demo beenden"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"Einrichtung abschließen"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"jetzt nicht"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Aktion während der Fahrt nicht verfügbar."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 789ed55..572cb38 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Επισκέπτης"</string>
     <string name="user_switch" msgid="6544839750534690781">"Εναλλαγή"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Εσείς (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Πληροφορίες προφίλ"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Όνομα"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Δεν έχει ρυθμιστεί"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Επεξεργασία ονόματος χρήστη"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Χρήστες και λογαριασμοί"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Χρήστης"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Λογαριασμοί για <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Επανάληψη"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Παράβλεψη"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ορισμός κλειδώματος οθόνης"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Επιλέξτε το μοτίβο σας"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Τρέχουσα οθόνη κλειδώματος"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Για λόγους ασφαλείας, ορίστε ένα μοτίβο"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Διαγραφή"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Κατάργηση κλειδώματος οθόνης;"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Έτσι όλοι οι χρήστες θα έχουν πρόσβαση στον λογαριασμό σας"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Εισαγάγετε τον αριθμό σας PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Εισαγάγετε κωδικό πρόσβασης"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Για λόγους ασφαλείας, ορίστε ένα PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Εισαγάγετε ξανά τον αριθμό PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Το PIN πρέπει να είναι τουλάχ. 4 ψηφία."</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Ο αριθμός PIN δεν είναι έγκυρος. Πρέπει να αποτελείται από τουλάχιστον 4 ψηφία."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Τα PIN δεν ταιριάζουν"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Σφάλμα κατά την αποθήκευση του PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Λανθασμένος αριθμός PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Λανθασμένος κωδικός πρόσβασης"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Για ασφάλεια, ορίστε κωδικό πρόσβασης"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Εισαγάγετε ξανά τον κωδικό πρόσβασης"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Ανόμοιοι κωδικοί πρόσβασης"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Ακύρωση"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Πλήκτρο Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Πλήκτρο Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Έξοδος από επίδειξη;"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Για τη διαγ. του λογ. επίδειξ. και την έξοδο από τη λειτ. επίδειξ. απαιτ. επαναφ. στις εργοστ. ρυθμ."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Έξοδος από επίδειξη"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Έξοδος από λειτ. επίδειξης"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Με αυτόν τον τρόπο, ο λογαριασμός επίδειξης θα χαθεί και θα γίνει επαναφορά των εργοστασιακών δεδομένων συστήματος. Όλα τα δεδομένα χρήστη θα χαθούν."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Έξοδος από επίδειξη"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ολοκλήρωση ρύθμισης"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"όχι τώρα"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Η ενέργεια δεν είναι διαθέσιμη κατά την οδήγηση"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 87bba97..6d7bbea 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Guest"</string>
     <string name="user_switch" msgid="6544839750534690781">"Switch"</string>
     <string name="current_user_name" msgid="3813671533249316823">"You (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profile info"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Name"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Not set up"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Edit user name"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Users &amp; accounts"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"User"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Accounts for <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Retry"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Skip"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Set a screen lock"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Choose your pattern"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Current screen lock"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"For security, set a pattern"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Clear"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Remove screen lock?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"This will allow anyone to access your account"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Enter your PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Enter your password"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"For security, set a PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Re-enter your PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN must be at least 4 digits"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN invalid. Must be at least 4 digits."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PINs don\'t match"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Error saving PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Wrong PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Wrong password"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"For security, set a password"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Re-enter your password"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Passwords don\'t match"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancel"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace key"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter key"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Exit Demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Deleting the demo account and exiting demo mode will require a factory reset"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Exit Demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Exit demo mode"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"This will delete the demo account and factory data reset the system. All user data will be lost."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Exit Demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"finish setup"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"not now"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Action not available while driving."</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 87bba97..6d7bbea 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Guest"</string>
     <string name="user_switch" msgid="6544839750534690781">"Switch"</string>
     <string name="current_user_name" msgid="3813671533249316823">"You (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profile info"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Name"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Not set up"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Edit user name"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Users &amp; accounts"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"User"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Accounts for <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Retry"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Skip"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Set a screen lock"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Choose your pattern"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Current screen lock"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"For security, set a pattern"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Clear"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Remove screen lock?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"This will allow anyone to access your account"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Enter your PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Enter your password"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"For security, set a PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Re-enter your PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN must be at least 4 digits"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN invalid. Must be at least 4 digits."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PINs don\'t match"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Error saving PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Wrong PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Wrong password"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"For security, set a password"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Re-enter your password"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Passwords don\'t match"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancel"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace key"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter key"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Exit Demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Deleting the demo account and exiting demo mode will require a factory reset"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Exit Demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Exit demo mode"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"This will delete the demo account and factory data reset the system. All user data will be lost."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Exit Demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"finish setup"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"not now"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Action not available while driving."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 87bba97..6d7bbea 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Guest"</string>
     <string name="user_switch" msgid="6544839750534690781">"Switch"</string>
     <string name="current_user_name" msgid="3813671533249316823">"You (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profile info"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Name"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Not set up"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Edit user name"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Users &amp; accounts"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"User"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Accounts for <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Retry"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Skip"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Set a screen lock"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Choose your pattern"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Current screen lock"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"For security, set a pattern"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Clear"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Remove screen lock?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"This will allow anyone to access your account"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Enter your PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Enter your password"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"For security, set a PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Re-enter your PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN must be at least 4 digits"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN invalid. Must be at least 4 digits."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PINs don\'t match"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Error saving PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Wrong PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Wrong password"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"For security, set a password"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Re-enter your password"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Passwords don\'t match"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancel"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace key"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter key"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Exit Demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Deleting the demo account and exiting demo mode will require a factory reset"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Exit Demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Exit demo mode"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"This will delete the demo account and factory data reset the system. All user data will be lost."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Exit Demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"finish setup"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"not now"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Action not available while driving."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 87bba97..6d7bbea 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Guest"</string>
     <string name="user_switch" msgid="6544839750534690781">"Switch"</string>
     <string name="current_user_name" msgid="3813671533249316823">"You (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profile info"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Name"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Not set up"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Edit user name"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Users &amp; accounts"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"User"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Accounts for <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Retry"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Skip"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Set a screen lock"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Choose your pattern"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Current screen lock"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"For security, set a pattern"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Clear"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Remove screen lock?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"This will allow anyone to access your account"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Enter your PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Enter your password"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"For security, set a PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Re-enter your PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN must be at least 4 digits"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN invalid. Must be at least 4 digits."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PINs don\'t match"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Error saving PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Wrong PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Wrong password"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"For security, set a password"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Re-enter your password"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Passwords don\'t match"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancel"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace key"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter key"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Exit Demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Deleting the demo account and exiting demo mode will require a factory reset"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Exit Demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Exit demo mode"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"This will delete the demo account and factory data reset the system. All user data will be lost."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Exit Demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"finish setup"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"not now"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Action not available while driving."</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index bdc87dd..bd9bd58 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎Guest‎‏‎‎‏‎"</string>
     <string name="user_switch" msgid="6544839750534690781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎Switch‎‏‎‎‏‎"</string>
     <string name="current_user_name" msgid="3813671533249316823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎You (%1$s)‎‏‎‎‏‎"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎Profile info‎‏‎‎‏‎"</string>
     <string name="user_name_label" msgid="3210832645046206845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎Name‎‏‎‎‏‎"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎Not set up‎‏‎‎‏‎"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎Edit user name‎‏‎‎‏‎"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎Users &amp; accounts‎‏‎‎‏‎"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎User‎‏‎‎‏‎"</string>
     <string name="account_list_title" msgid="7631588514613843065">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‎Accounts for ‎‏‎‎‏‏‎<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎Retry‎‏‎‎‏‎"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎Skip‎‏‎‎‏‎"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎Set a screen lock‎‏‎‎‏‎"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎Choose your pattern‎‏‎‎‏‎"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎Current screen lock‎‏‎‎‏‎"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎For security, set a pattern‎‏‎‎‏‎"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎Clear‎‏‎‎‏‎"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎OK‎‏‎‎‏‎"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎Remove screen lock?‎‏‎‎‏‎"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎This will allow anyone to access your account‎‏‎‎‏‎"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎Enter your PIN‎‏‎‎‏‎"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎Enter your password‎‏‎‎‏‎"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎For security, set a PIN‎‏‎‎‏‎"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎Re-enter your PIN‎‏‎‎‏‎"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎PIN must be at least 4 digits‎‏‎‎‏‎"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‎Pin invalid, must be at least 4 digits.‎‏‎‎‏‎"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎PINs don\'t match‎‏‎‎‏‎"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎Error saving PIN‎‏‎‎‏‎"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎Wrong PIN‎‏‎‎‏‎"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎Wrong password‎‏‎‎‏‎"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎For security, set a password‎‏‎‎‏‎"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎Re-enter your password‎‏‎‎‏‎"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎Passwords don\'t match‎‏‎‎‏‎"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎Cancel‎‏‎‎‏‎"</string>
     <string name="backspace_key" msgid="1545590866688979099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎Backspace key‎‏‎‎‏‎"</string>
     <string name="enter_key" msgid="2121394305541579468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎Enter key‎‏‎‎‏‎"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‏‎‎Exit Demo?‎‏‎‎‏‎"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎Deleting the demo account and exiting demo mode will require a factory reset‎‏‎‎‏‎"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎Exit Demo‎‏‎‎‏‎"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎Exit demo mode‎‏‎‎‏‎"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎This will delete the demo account and factory data reset the system. All user data will be lost.‎‏‎‎‏‎"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎Exit Demo‎‏‎‎‏‎"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎finish setup‎‏‎‎‏‎"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎not now‎‏‎‎‏‎"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎Action not available while driving.‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2f03749..84b096f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Invitado"</string>
     <string name="user_switch" msgid="6544839750534690781">"Cambiar"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Tú (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Datos del perfil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nombre"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"No configurado"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Editar el nombre de usuario"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Usuarios y cuentas"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Usuario"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Cuentas de <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Reintentar"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Omitir"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Establece un bloqueo de pantalla"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Elige un patrón"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Bloqueo de pantalla actual"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Por seguridad, establece un patrón"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Borrar"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Aceptar"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"¿Quitar bloqueo de pantalla?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Si lo haces, cualquiera podrá acceder a tu cuenta"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Ingresa tu PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Ingresa tu contraseña"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Por seguridad, establece un PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Vuelve a ingresar el PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"El PIN debe tener al menos 4 dígitos"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"El PIN no es válido (debe tener al menos 4 dígitos)."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Los PIN no coinciden"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Error al guardar el PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN incorrecto"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Contraseña incorrecta"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Por seguridad, establece una contraseña"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Vuelve a ingresar la contraseña"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Las contraseñas no coinciden"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancelar"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tecla de retroceso"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tecla Intro"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"¿Salir de demostración?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Para borrar la cuenta de demostración y salir de este modo, restablece la configuración de fábrica"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Salir de la demostración"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Salir del modo de demostración"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Esta acción borrará la cuenta de demostración y restablecerá el sistema a la configuración de fábrica. Se perderán todos los datos del usuario."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Salir de la demostración"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"terminar de configurar"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ahora no"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Esta acción no está disponible mientras conduces."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 442aa16..d69e0ee 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Invitado"</string>
     <string name="user_switch" msgid="6544839750534690781">"Cambiar"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Tú (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Información del perfil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nombre"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Sin configurar"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Cambiar el nombre de usuario"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Usuarios y cuentas"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Usuario"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Cuentas de <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Reintentar"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Saltar"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Definir un bloqueo de pantalla"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Elige un patrón"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Bloqueo de pantalla actual"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Por seguridad, establece un patrón"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Borrar"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Aceptar"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"¿Quitar bloqueo de pantalla?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Cualquier usuario podrá acceder a tu cuenta"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Introduce tu PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Introduce tu contraseña"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Por seguridad, establece un PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Vuelve a introducir tu PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"El PIN debe tener al menos 4 dígitos"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"El PIN no es válido: debe tener al menos 4 dígitos."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Los PIN no coinciden"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"No se ha podido guardar el PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN incorrecto"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Contraseña incorrecta"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Por seguridad, establece una contraseña"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Vuelve a introducir tu contraseña"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Las contraseñas no coinciden"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancelar"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tecla de retroceso"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tecla Intro"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"¿Salir de demostración?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Para eliminar la cuenta demo y salir del modo demo, es necesario restablecer el estado de fábrica"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Salir de demostración"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Salir del modo demostración"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Se eliminará la cuenta de demostración y se recuperarán los ajustes de fábrica del sistema. Se perderán todos los datos de usuario."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Salir de demostración"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"finalizar configuración"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ahora no"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Esta acción no está disponible mientras conduces."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b5c3e4a..370c085 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Külaline"</string>
     <string name="user_switch" msgid="6544839750534690781">"Lüliti"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Teie (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profiili teave"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nimi"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Pole seadistatud"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Kasutajanime muutmine"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Kasutajad ja kontod"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Kasutaja"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Kasutaja <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> kontod"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Proovi uuesti"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Jäta vahele"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ekraaniluku seadistamine"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Mustri valimine"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Praegune ekraanilukk"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Turvalisuse huvides määrake muster"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Kustuta"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Kas eemaldada ekraanilukk?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"See lubab igaühel teie kontole juurde pääseda"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Sisestage PIN-kood"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Sisestage parool"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Turvalisuse huvides määrake PIN-kood"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Sisestage oma PIN-kood uuesti"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-kood peab sisald. vähemalt 4 numbrit"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN-kood on sobimatu, see peab sisaldama vähemalt nelja numbrit."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-koodid ei ühti"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Viga PIN-koodi salvestamisel"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Vale PIN-kood"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Vale parool"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Turvalisuse huvides määrake parool"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Sisestage oma parool uuesti"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Paroolid ei ühti"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Tühista"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tagasilükkeklahv"</string>
     <string name="enter_key" msgid="2121394305541579468">"Sisestusklahv"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Kas väljuda demorežiim.?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Demokonto kustutamiseks ja demorežiimist väljumiseks tuleb seade lähtestada tehaseseadetele"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Välju demorežimist"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Demorežiimist väljumine"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"See kustutab demokonto ja lähtestab süsteemi tehaseandmetele. Kõik kasutajaandmed lähevad kaotsi."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Välju demorežimist"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"vii seadistus lõpule"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"mitte praegu"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Toiming pole sõidu ajal saadaval."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 9f8d216..d801def 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gonbidatua"</string>
     <string name="user_switch" msgid="6544839750534690781">"Aldatu"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Zu (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profilaren informazioa"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Izena"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Konfiguratu gabe"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Editatu erabiltzaile-izena"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Erabiltzaileak eta kontuak"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Erabiltzailea"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> erabiltzailearen kontuak"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Saiatu berriro"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Saltatu"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ezarri pantailaren blokeo bat"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Aukeratu eredu bat"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Uneko pantailaren blokeoa"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Babestuta egoteko, ezarri eredu bat"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Garbitu"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Ados"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Pantailaren blokeoa kendu?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Edonork atzitu ahalko du zure kontua"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Idatzi PIN kodea"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Idatzi pasahitza"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Babestuta egoteko, ezarri PIN bat"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Idatzi berriro PIN kodea"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Gutxienez 4 digitu izan behar ditu PINak"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN kodeak ez du balio: gutxienez lau digitu izan behar ditu."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN kodeak ez datoz bat"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Errore bat gertatu da PINa gordetzean"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN kodea ez da zuzena"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Pasahitza ez da zuzena"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Babestuta egoteko, ezarri pasahitz bat"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Idatzi berriro pasahitza"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Pasahitzak ez datoz bat"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Utzi"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Atzera tekla"</string>
     <string name="enter_key" msgid="2121394305541579468">"Sartu tekla"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Demo modutik irten?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Demo-kontua eta lehendik dagoen demo modua ezabatuz gero, jatorrizko ezarpenak berrezarri behar dira"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Irten demo modutik"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Irten demo modutik"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Demo kontua ezabatuko da eta sistemaren jatorrizko datuak berrezarriko dira. Erabiltzaile-datu guztiak galdu egingo dira."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Irten demo modutik"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"amaitu konfiguratzen"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"orain ez"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Ekintza hori ez dago erabilgarri gidatzen ari zarenean."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9ae5cfc..4f7dad3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"مهمان"</string>
     <string name="user_switch" msgid="6544839750534690781">"جابه‌جایی"</string>
     <string name="current_user_name" msgid="3813671533249316823">"شما (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"اطلاعات نمایه"</string>
     <string name="user_name_label" msgid="3210832645046206845">"نام"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"تنظیم نشده"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"ویرایش نام کاربر"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"کاربران و حساب‌ها"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"کاربر"</string>
     <string name="account_list_title" msgid="7631588514613843065">"حساب‌های <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"امتحان مجدد"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"رد شدن"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"تنظیم قفل صفحه"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"انتخاب الگو"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"قفل صفحه فعلی"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"برای حفظ امنیت، الگو تنظیم کنید"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"پاک کردن"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"تأیید"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"قفل صفحه برداشته شود؟"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"این کار به همه افراد اجازه می‌دهد به حسابتان دسترسی پیدا کنند"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"پین را وارد کنید"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"گذرواژه‌تان را وارد کنید"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"برای حفظ امنیت، پین تنظیم کنید"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"پین خود را دوباره وارد کنید"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"پین باید حداقل ۴ رقمی باشد"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"پین نامعتبر است، پین باید حداقل ۴ رقم داشته باشد."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"پین‌ها با یکدیگر مطابقت ندارند"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"خطای ذخیره پین"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"پین اشتباه"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"گذرواژه اشتباه است"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"برای حفظ امنیت، گذرواژه‌‌ای تنظیم کنید"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"گذرواژه‌ خود را دوباره وارد کنید"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"رمزهای ورود مطابقت ندارند"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"لغو"</string>
     <string name="backspace_key" msgid="1545590866688979099">"کلید پس‌بر"</string>
     <string name="enter_key" msgid="2121394305541579468">"کلید را وارد کنید"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"از حالت نمایشی خارج می‌شوید؟"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"حذف حساب نمایشی و حالت نمایشی موجود به بازنشانی کارخانه‌ای نیاز دارد"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"خروج از حالت نمایشی"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"خروج از حالت نمایشی"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"با این کار حساب نمایشی حذف و سیستم به داده‌های کارخانه بازنشانی می‌شود. همه داده‌های کاربر از بین می‌روند."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"خروج از حالت نمایشی"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"اتمام راه‌اندازی"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"الان نه"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"کنش هنگام رانندگی دردسترس نیست."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 39b8440..e21972d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Vieras"</string>
     <string name="user_switch" msgid="6544839750534690781">"Vaihda"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Sinä (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profiilin tiedot"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nimi"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Ei määritetty"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Käyttäjätunnuksen muokkaus"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Käyttäjät ja tilit"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Käyttäjä"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Tilit: <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Yritä uudelleen"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Ohita"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Näytön lukituksen valinta"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Valitse kuvio"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Nykyinen näytön lukitus"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Aseta kuvio tietoturvasyistä"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Tyhjennä"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Poistetaanko näytön lukitus?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Tämän avulla kuka tahansa voi päästä tilillesi"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Syötä PIN-koodi"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Syötä salasana"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Aseta PIN-koodi tietoturvasyistä"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Syötä PIN-koodi uudelleen"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-koodin vähimmäispituus on 4 merkkiä."</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Virheellinen PIN-koodi. Vähimmäispituus on 4 numeroa."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-koodit eivät täsmää"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Virhe tallennettaessa PIN-koodia"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Väärä PIN-koodi"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Väärä salasana"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Aseta salasana tietoturvasyistä"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Syötä salasana uudelleen"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Salasanat eivät täsmää"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Peruuta"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Askelpalautin"</string>
     <string name="enter_key" msgid="2121394305541579468">"Lisää avain"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Suljetaanko esittely?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Esittelytilin poistaminen ja esittelyn sulkeminen edellyttävät tehdasasetusten palauttamista."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Sulje esittely"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Poistu esittelytilasta"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tämä poistaa esittelytilin ja palauttaa järjestelmän tehdasasetukset. Kaikki käyttäjätiedot poistetaan."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Sulje esittely"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"viimeistele asennus"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ei nyt"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Tämä ei ole käytettävissä ajon aikana."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c7129fc..3ff3ceb 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Invité"</string>
     <string name="user_switch" msgid="6544839750534690781">"Changer"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Vous (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Détails du profil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nom"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Non configuré"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Modifier le nom d\'utilisateur"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Utilisateurs et comptes"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Utilisateur"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Comptes pour <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Réessayer"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Ignorer"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Configurer le verrouillage de l\'écran"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Choisissez votre schéma"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Verrouillage actuel de l\'écran"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Pour votre sécurité, déf. un sch. de verr."</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Effacer"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Suppr. le verrouill. de l\'écran?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Cela permettra à quiconque d\'accéder à votre compte"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Entrez votre NIP"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Entrez votre mot de passe"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Pour plus de sécurité, définissez un NIP"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Confirmez votre NIP"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Le NIP doit contenir au moins 4 chiffres"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Le NIP n\'est pas valide, il doit contenir au moins 4 chiffres."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Les NIP ne correspondent pas"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Erreur lors de l\'enregistrement du NIP"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"NIP incorrect"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Mot de passe incorrect"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Pour votre sécurité, déf. un m. de passe"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Confirmez votre mot de passe"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Les m. de passe ne corresp. pas"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Annuler"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Touche Retour arrière"</string>
     <string name="enter_key" msgid="2121394305541579468">"Touche Entrée"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Quitter le mode démo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Pour quitter le mode de démo et supprimer le compte de démo, vous devrez réinitialiser l\'appareil"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Quitter le mode démo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Quitter le mode démo"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Cette action supprimera le compte de démonstration et réinitialisera le système. Toutes les données de l\'utilisateur seront perdues."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Quitter le mode démo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"terminer la configuration"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"pas maintenant"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Cette action n\'est pas accessible durant la conduite."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f5bab03..8728c16 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Invité"</string>
     <string name="user_switch" msgid="6544839750534690781">"Changer"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Vous (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Infos de profil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nom"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Non configuré"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Modifier le nom d\'utilisateur"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Utilisateurs et comptes"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Utilisateur"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Comptes de <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Réessayer"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Passer"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Configurer le verrouillage de l\'écran"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Choisir votre schéma"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Verrouillage de l\'écran actuel"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Pour la sécurité, définissez un schéma"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Effacer"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Annuler le verrouillage écran ?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Si vous continuez, n\'importe qui pourra accéder à votre compte"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Saisir votre code"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Saisissez votre mot de passe"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Pour la sécurité, définissez un code"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Saisissez de nouveau votre code"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Le code doit contenir au moins 4 chiffres"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Le code doit contenir au moins 4 chiffres."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Codes non concordants"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Erreur d\'enregistrement du code"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Code incorrect"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Mot de passe incorrect"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Pour la sécurité, choisir un mot de passe"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Saisissez de nouveau votre mot de passe"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Mots de passe non concordants"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Annuler"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Touche \"Retour arrière\""</string>
     <string name="enter_key" msgid="2121394305541579468">"Touche \"Entrée\""</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Quitter la démo ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Suppression du compte démo et sortie mode démo nécessitent rétablissement de configuration d\'usine"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Quitter la démo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Quitter le mode de démo"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Le compte de démonstration sera supprimé et la configuration d\'usine du système sera rétablie. Toutes les données utilisateur seront perdues."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Quitter la démo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"terminer la configuration"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"pas maintenant"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Action non disponible lorsque vous conduisez."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c44ef81..6767c22 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Convidado"</string>
     <string name="user_switch" msgid="6544839750534690781">"Cambiar"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Ti (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Información do perfil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nome"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Sen configurar"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Editar nome de usuario"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Usuarios e contas"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Usuario"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Contas de <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Tentar de novo"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Omitir"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Definir un bloqueo de pantalla"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Seleccionar o teu padrón"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Bloqueo de pantalla actual"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Por cuestións de seguranza, define un padrón"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Borrar"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Aceptar"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Eliminar bloqueo de pantalla?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Desta forma calquera poderá acceder á túa conta"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Introduce o teu PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Introduce o teu contrasinal"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Por cuestións de seguranza, define un PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Volve introducir o teu PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"O PIN debe conter polo menos 4 díxitos"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"O PIN non é válido, debe conter como mínimo 4 díxitos."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Os PIN non coinciden"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Erro ao gardar o PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"O PIN é incorrecto"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"O contrasinal é incorrecto"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Por cuestións de seguranza, define un contrasinal"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Volve introducir o teu contrasinal"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Os contrasinais non coinciden"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancelar"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tecla de retroceso"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tecla Intro"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Saír da demostración?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Para saír do modo de demostración e eliminar a conta, necesítase restablecemento de fábrica"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Saír da demostración"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Sae do modo de demostración"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Con esta acción eliminarase a conta de demostración e restableceranse os datos de fábrica do sistema. Perderanse todos os datos do usuario."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Saír da demostración"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"finalizar configuración"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"agora non"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Esta acción non está dispoñible durante a condución."</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index be06cc3..771356a 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"અતિથિ"</string>
     <string name="user_switch" msgid="6544839750534690781">"સ્વિચ કરો"</string>
     <string name="current_user_name" msgid="3813671533249316823">"તમે (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"પ્રોફાઇલ માહિતી"</string>
     <string name="user_name_label" msgid="3210832645046206845">"નામ"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"સેટ કરેલ નથી"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"વપરાશકર્તાઓ અને એકાઉન્ટ"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"વપરાશકર્તા"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> માટેના એકાઉન્ટ"</string>
@@ -207,6 +208,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ફરી પ્રયાસ કરો"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"છોડો"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"સ્ક્રીન લૉક સેટ કરો"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"તમારી પૅટર્ન પસંદ કરો"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"વર્તમાન સ્ક્રીન લૉક"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"સુરક્ષા માટે, એક પૅટર્ન સેટ કરો"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"સાફ કરો"</string>
@@ -223,12 +225,16 @@
     <string name="okay" msgid="4589873324439764349">"ઓકે"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"સ્ક્રીન લૉક કાઢી નાખીએ?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"આ ક્રિયા તમારા એકાઉન્ટને ઍક્સેસ કરવાની મંજૂરી કોઈને પણ આપશે"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"તમારો પિન દાખલ કરો"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"તમારો પાસવર્ડ દાખલ કરો"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"સુરક્ષા માટે, પિન સેટ કરો"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"તમારો પિન ફરી દાખલ કરો"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"પિન ઓછામાં ઓછો 4 અંકનો હોવો આવશ્યક છે"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"પિન અમાન્ય, ઓછામાં ઓછા 4 અંકનો હોવો આવશ્યક છે."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"પિન મેળ ખાતા નથી"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"પિન સાચવવામાં ભૂલ"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"ખોટો પિન"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"ખોટો પાસવર્ડ"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"સુરક્ષા માટે, પાસવર્ડ સેટ કરો"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"તમારો પાસવર્ડ ફરી દાખલ કરો"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"પાસવર્ડ મેળ ખાતા નથી"</string>
@@ -280,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"રદ કરો"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace કી"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter કી"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ડેમોમાંથી બહાર નીકળીએ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ડેમો એકાઉન્ટ ડિલીટ કરવા અને ડેમો મોડમાંથી બહાર નીકળવા માટે ફેક્ટરી રીસેટની આવશ્યકતા છે"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ડેમોમાંથી બહાર નીકળો"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ડેમો મોડમાંથી બહાર નીકળો"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"આ ક્રિયા ડેમો એકાઉન્ટ ડિલીટ કરશે અને સિસ્ટમને ફેક્ટરી ડેટા પર રીસેટ કરશે. વપરાશકર્તાનો બધો ડેટા ગુમ થશે."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ડેમોમાંથી બહાર નીકળો"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"સેટઅપ સમાપ્ત કરો"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"હમણાં નહીં"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ડ્રાઇવિંગ કરતી વખતે આ ક્રિયા ઉપલબ્ધ રહેશે નહીં."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c043fcc..4613649 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -29,7 +29,7 @@
     <string name="keywords_display_brightness_level" msgid="3956411572536209195">"हल्की रोशनी वाली स्क्रीन, टचस्‍क्रीन, बैटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="2700310050333468752">"हल्की रोशनी वाली स्क्रीन, टचस्‍क्रीन, बैटरी"</string>
     <string name="keywords_display_night_display" msgid="2922294576679769957">"हल्की रोशनी वाली स्क्रीन, नाइट, टिंट"</string>
-    <string name="night_mode_tile_label" msgid="6603597795502131664">"नाइट मोड"</string>
+    <string name="night_mode_tile_label" msgid="6603597795502131664">"रात वाला मोड"</string>
     <string name="wifi_settings" msgid="7701477685273103841">"वाई-फ़ाई"</string>
     <string name="wifi_settings_summary" msgid="6095898149997291025">"वायरलेस एक्सेस पॉइंट सेट और प्रबंधित करें"</string>
     <string name="wifi_starting" msgid="473253087503153167">"वाई-फ़ाई चालू हो रहा है…"</string>
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"मेहमान"</string>
     <string name="user_switch" msgid="6544839750534690781">"स्विच करें"</string>
     <string name="current_user_name" msgid="3813671533249316823">"आप (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"प्रोफ़ाइल की जानकारी"</string>
     <string name="user_name_label" msgid="3210832645046206845">"नाम"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"सेट नहीं है"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"उपयोगकर्ता नाम में बदलाव करें"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"उपयोगकर्ता और खाते"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"उपयोगकर्ता"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> के खाते"</string>
@@ -194,24 +194,21 @@
     <string name="user_add_user_message_update" msgid="1528170913388932459">"कोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप्लिकेशन अपडेट कर सकते हैं."</string>
     <string name="security_settings_title" msgid="6955331714774709746">"सुरक्षा"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"स्क्रीन लॉक"</string>
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"कोई नहीं"</string>
     <string name="security_lock_pattern" msgid="1174352995619563104">"पैटर्न"</string>
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"पिन"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"पासवर्ड"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"स्क्रीन लॉक करने का तरीका चुनें"</string>
     <string name="screen_lock_options" msgid="7023338635352915768">"स्क्रीन लॉक के विकल्प"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"अपना पैटर्न डालें"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"पुष्टि करें"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"फिर से बनाएं"</string>
     <string name="continue_button_text" msgid="5129979170426836641">"जारी रखें"</string>
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"फिर से कोशिश करें"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"छोड़ें"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"स्क्रीन लॉक सेट करना"</string>
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"अनलॉक करने के लिए पैटर्न चुनें"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"मौजूदा स्क्रीन लॉक"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"सुरक्षा के लिए पैटर्न सेट करें"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"हटाएं"</string>
     <string name="lockpattern_cancel_button_text" msgid="4068764595622381766">"अभी नहीं"</string>
@@ -225,9 +222,10 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"लॉक खोलने का पैटर्न बनाने का तरीका"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"पैटर्न सेव करने में गड़बड़ी हुई"</string>
     <string name="okay" msgid="4589873324439764349">"ठीक है"</string>
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"स्क्रीन लॉक हटाएं?"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"स्क्रीन लॉक हटाने पर कोई भी आपका खाता इस्तेमाल कर सकता है"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"अनलॉक करने के लिए पिन डालें"</string>
+    <!-- no translation found for lock_settings_enter_password (2636669926649496367) -->
     <skip />
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"सुरक्षा के लिए पिन सेट करें"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"पिन दोबारा डालें"</string>
@@ -235,6 +233,9 @@
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"यह पिन अमान्य है, इसमें कम से कम 4 अंक होने चाहिए."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"पिन मेल नहीं खाते"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"पिन सेव करने में गडबड़ी हुई"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"डाला गया पिन गलत है"</string>
+    <!-- no translation found for lockscreen_wrong_password (5757087577162231825) -->
+    <skip />
     <string name="choose_lock_password_message" msgid="6124341145027370784">"सुरक्षा के लिए पासवर्ड सेट करें"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"पासवर्ड दोबारा डालें"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"पासवर्ड मेल नहीं खाते"</string>
@@ -286,8 +287,10 @@
     <string name="cancel" msgid="750286395700355455">"अभी नहीं"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace बटन"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter बटन"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"डेमो मोड से बाहर आएं?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"डेमो खाता मिटाने और मौजूदा डेमो मोड से बाहर आने के लिए डिवाइस को फ़ैक्ट्री रीसेट करना ज़रूरी है"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"डेमो मोड से बाहर निकलें"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"डेमो मोड से बाहर निकलें"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"डेमो मोड से बाहर निकलने पर, डेमो खाता मिट जाएगा और सिस्टम का डेटा फ़ैक्ट्री रीसेट हो जाएगा. साथ ही, उपयोगकर्ता का पूरा डेटा भी मिट जाएगा."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"डेमो मोड से बाहर निकलें"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"सेटअप पूरा करें"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"अभी नहीं"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"गाड़ी चलाते समय यह काम नहीं किया जा सकता."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c23f269..77de274 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -174,9 +174,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gost"</string>
     <string name="user_switch" msgid="6544839750534690781">"Prebaci"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Vi (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informacije profila"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Ime"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nije postavljen"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Uređivanje korisničkog imena"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Korisnici i računi"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Korisnik"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Računi za korisnika <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -208,6 +208,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Pokušaj ponovno"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Preskoči"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Postavljanje zaključavanja zaslona"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Odaberite uzorak"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Trenutačno zaključavanje zaslona"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Radi sigurnosti postavite uzorak"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Ukloni"</string>
@@ -224,12 +225,16 @@
     <string name="okay" msgid="4589873324439764349">"U redu"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Ukloniti zaključavanje zaslona?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Druge osobe moći će pristupiti vašem računu"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Unesite PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Unesite zaporku"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Radi sigurnosti postavite PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Ponovni unos PIN-a"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN mora imati barem četiri znamenke"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN nije važeći. Mora imati najmanje četiri znamenke."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-ovi se ne podudaraju"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Pogreška pri spremanju PIN-a"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Pogrešan PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Pogrešna zaporka"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Radi sigurnosti postavite zaporku"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Ponovni unos zaporke"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Zaporke se ne podudaraju"</string>
@@ -287,8 +292,10 @@
     <string name="cancel" msgid="750286395700355455">"Otkaži"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tipka Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tipka Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Napustiti demo-način?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Da bi se izbrisao demo-račun i napustio demo-način, potrebno je vratiti uređaj na tvorničke postavke"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Napustite demo-način"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Napustite demo-način"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Time će se izbrisati demo-račun, a sustav će se vratiti na tvorničko stanje. Svi će se podaci korisnika izgubiti."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Napustite demo-način"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"dovršite postavljanje"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ne sada"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Radnja nije dostupna tijekom vožnje."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 988feeb..c210798 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Vendég"</string>
     <string name="user_switch" msgid="6544839750534690781">"Váltás"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Ön (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profiladatok"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Név"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nincs beállítva"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Felhasználónév szerkesztése"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Felhasználók és fiókok"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Felhasználó"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> fiókjai"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Újra"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Kihagyás"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Képernyőzár beállítása"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Válassza ki a mintát"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Jelenlegi képernyőzár"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"A biztonság érdekében állítson be mintát"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Törlés"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Rendben"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Eltávolítja a képernyőzárat?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Ezzel bárki hozzáférhet majd az Ön fiókjához"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Adja meg PIN-kódját"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Adja meg jelszavát"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"A biztonság miatt állítson be PIN-kódot"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Adja meg újra a PIN-kódot"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-kód: legalább 4 számjegy"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"A PIN-kód érvénytelen; legalább 4 számjegyből kell állnia."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"A PIN-kódok nem egyeznek"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Hiba történt a PIN-kód mentése során"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Helytelen PIN-kód"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Helytelen jelszó"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"A biztonság miatt állítson be jelszót"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Adja meg újra a jelszót"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"A jelszavak nem egyeznek"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Mégse"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace billentyű"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter billentyű"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Kilép a demóból?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"A demófiók törléséhez és a demómódból történő kilépéshez vissza kell állítani a gyári beállításokat"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Kilépés a demóból"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Kilépés a demó módból"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ez törli a demófiókot, és visszaállítja a rendszer gyári adatait. Az összes felhasználói adat elveszik."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Kilépés a demóból"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"beállítás befejezése"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"most nem"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"A művelet nem hajtható végre vezetés közben."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index a834512..b79ac67 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Հյուր"</string>
     <string name="user_switch" msgid="6544839750534690781">"Փոխել օգտատիրոջը"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Դուք (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Պրոֆիլի տվյալներ"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Անուն"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Կարգավորված չէ"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Օգտատիրոջ անվան փոփոխում"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Օգտատերեր և հաշիվներ"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Օգտատեր"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>-ի հաշիվներ"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Կրկնել"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Բաց թողնել"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Էկրանի կողպման կարգավորում"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Ընտրեք ձեր նախշը"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Կողպման ընթացիկ եղանակը"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Անվտանգության համար ավելացրեք նախշ"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Մաքրել"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Հաստատել"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Անջատե՞լ էկրանի կողպումը"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Ցանկացած մարդ կկարողանա մտնել ձեր հաշիվ"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Մուտքագրեք PIN կոդը"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Մուտքագրեք ձեր գաղտնաբառը"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Անվտանգության համար ավելացրեք PIN կոդ"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Նորից մուտքագրեք PIN կոդը"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN կոդը պետք է առնվազն 4 թիվ պարունակի"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN կոդն անվավեր է. պետք է առնվազն 4 թիվ պարունակի:"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN կոդերը չեն համընկնում"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Չհաջողվեց պահել PIN-ը"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN կոդը սխալ է"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Գաղտնաբառը սխալ է"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Անվտանգության համար ավելացրեք գաղտնաբառ"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Նորից մուտքագրեք գաղտնաբառը"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Գաղտնաբառերը չեն համընկնում"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Չեղարկել"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace ստեղն"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter ստեղն"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Անջատե՞լ դեմո ռեժիմը"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Փորձնական հաշիվը ջնջելու և դեմո ռեժիմից դուրս գալու համար գործարանային վերակայում է անհրաժեշտ"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Անջատել դեմո ռեժիմը"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Ելք դեմո ռեժիմից"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Դեմո հաշիվը կջնջվի, և համակարգում կվերականգնվեն գործարանային տվյալները։ Օգտատիրոջ բոլոր տվյալները կկորչեն։"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Անջատել դեմո ռեժիմը"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ավարտել կարգավորումը"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ոչ հիմա"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Գործողությունը վարելու ընթացքում հասանելի չէ:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 7efbacf..67a304f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Tamu"</string>
     <string name="user_switch" msgid="6544839750534690781">"Ganti"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Anda (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Info profil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nama"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Tidak disiapkan"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Edit nama pengguna"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Pengguna &amp; akun"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Pengguna"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Akun untuk <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Coba lagi"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Lewati"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Setel kunci layar"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Pilih pola Anda"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Kunci layar saat ini"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Untuk keamanan, setel pola"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Hapus"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Oke"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Hapus kunci layar?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Tindakan ini akan mengizinkan siapa pun mengakses akun Anda"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Masukkan PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Masukkan sandi"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Untuk keamanan, setel PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Masukkan ulang PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN harus minimal 4 digit"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN tidak valid, minimal 4 digit."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN tidak cocok"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Error saat menyimpan PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN Salah"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Sandi salah"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Untuk keamanan, setel sandi"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Masukkan ulang sandi"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Sandi tidak cocok"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Batal"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tombol backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tombol enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Keluar dari Demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Menghapus akun demo dan keluar dari mode demo akan membutuhkan tindakan reset ke setelan pabrik"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Keluar dari Demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Keluar dari mode demo"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tindakan ini akan menghapus akun demo dan mereset sistem ke setelan pabrik. Semua data pengguna akan hilang."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Keluar dari Demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"selesaikan penyiapan"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"lain kali"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Tindakan tidak tersedia saat mengemudi."</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 6c47b82..52aa404 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gestur"</string>
     <string name="user_switch" msgid="6544839750534690781">"Skipta"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Þú (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Upplýsingar um snið"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nafn"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Ekki uppsett"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Breyta notandanafni"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Notendur og reikningar"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Notandi"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Reikningar fyrir <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Reyna aftur"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Sleppa"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Setja upp skjálás"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Veldu þér mynstur"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Núverandi skjálás"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Settu upp mynstur til að gæta fyllsta öryggis"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Hreinsa"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Í lagi"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Viltu fjarlægja skjálás?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Þetta gefur hverjum sem er aðgang að reikningnum þínum"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Sláðu inn PIN-númer"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Sláðu inn aðgangsorðið þitt"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Settu upp PIN-númer til að gæta fyllsta öryggis"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Sláðu PIN-númerið inn aftur"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-númer þarf að vera a.m.k. fjórir tölustafir"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN-númerið er ógilt. Það þarf að vera minnst fjórir tölustafir."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-númerin stemma ekki"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Villa við að vista PIN-númer"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Rangt PIN-númer"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Rangt aðgangsorð"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Settu upp aðgangsorð til að gæta fyllsta öryggis"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Sláðu aðgangsorðið inn aftur"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Aðgangsorðin stemma ekki."</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Hætta við"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Bakklykill"</string>
     <string name="enter_key" msgid="2121394305541579468">"Færslulykill"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Loka kynningarútgáfu?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Til að eyða reikningi kynningarútgáfu og fara úr kynningarstillingu þarf að núllstilla tækið"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Hætta í kynningarútgáfu"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Hætta í kynningarútgáfu"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Þetta eyðir kynningarreikningnum og núllstillir kerfið. Öll notandagögn glatast."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Hætta í kynningarútgáfu"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ljúka við uppsetningu"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ekki núna"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Aðgerðin er ekki í boði meðan á akstri stendur."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4c0c2c3..fe6b599 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Ospite"</string>
     <string name="user_switch" msgid="6544839750534690781">"Cambia"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Tu (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informazioni profilo"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nome"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Non configurato"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Modifica il nome utente"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Utenti e account"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Utente"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Account per <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Riprova"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Ignora"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Imposta un blocco schermo"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Scegli la tua sequenza"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Blocco schermo attuale"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Per sicurezza, imposta una sequenza"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Cancella"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Rimuovere il blocco schermo?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"In questo modo chiunque potrà accedere al tuo dispositivo"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Inserisci il PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Inserisci la password"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Per sicurezza, imposta un PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Inserisci di nuovo il PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Il PIN deve avere almeno quattro cifre"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN non valido: deve avere almeno quattro cifre."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"I PIN non corrispondono"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Errore di salvataggio del PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN errato"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Password errata"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Per sicurezza, imposta una password"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Inserisci di nuovo la password"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Le password non corrispondono"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Annulla"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tasto Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Inserisci il codice"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Chiudere la demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Ripristina i dati di fabbrica per eliminare l\'account dimostrativo e uscire dalla modalità demo"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Chiudi demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Esci dalla modalità demo"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"L\'account dimostrativo verrà eliminato e verranno ripristinati i dati di fabbrica del sistema. Tutti i dati utente andranno persi."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Chiudi demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"termina configurazione"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"non ora"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Azione non disponibile durante la guida."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 16e449b..b4b87b1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"אורח"</string>
     <string name="user_switch" msgid="6544839750534690781">"החלפה"</string>
     <string name="current_user_name" msgid="3813671533249316823">"את/ה (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"פרטי פרופיל"</string>
     <string name="user_name_label" msgid="3210832645046206845">"שם"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"לא מוגדר"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"עריכת שם המשתמש"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"משתמשים וחשבונות"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"משתמש"</string>
     <string name="account_list_title" msgid="7631588514613843065">"חשבונות עבור <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ניסיון חוזר"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"דילוג"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"הגדרת מסך נעילה"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"הגדרת הקו לביטול נעילה"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"נעילת המסך הנוכחית"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"מטעמי אבטחה, יש להגדיר קו ביטול נעילה"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"ניקוי"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"אישור"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"להסיר את נעילת המסך?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"פעולה זו תאפשר לכל אחד לגשת לחשבון שלך"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"הזנת קוד גישה"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"הזנת סיסמה"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"לשיפור האבטחה, מומלץ להגדיר קוד גישה"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"יש להזין שוב את קוד הגישה"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"קוד הגישה חייב לכלול 4 ספרות לפחות"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"קוד גישה לא חוקי, צריך להכיל 4 ספרות לפחות."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"קודי הגישה אינם תואמים"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"שגיאה בשמירת קוד הגישה"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"קוד גישה שגוי"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"סיסמה שגויה"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"לשיפור האבטחה, מומלץ להגדיר סיסמה"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"יש להזין את הסיסמה שוב"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"הסיסמאות לא תואמות"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"ביטול"</string>
     <string name="backspace_key" msgid="1545590866688979099">"מקש Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"הזנת מפתח"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"לצאת ממצב ההדגמה?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"לאחר מחיקת חשבון ההדגמה ויציאה ממצב הדגמה, נדרש איפוס להגדרות היצרן"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"יציאה ממצב הדגמה"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"יציאה ממצב הדגמה"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"פעולה זו תמחק את חשבון ההדגמה ותבצע למערכת איפוס לנתוני היצרן. כל נתוני המשתמש יאבדו."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"יציאה ממצב הדגמה"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"סיום ההגדרה"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"לא עכשיו"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"הפעולה לא זמינה במהלך הנהיגה."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6faf0bd..3fe37e5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"ゲスト"</string>
     <string name="user_switch" msgid="6544839750534690781">"切り替える"</string>
     <string name="current_user_name" msgid="3813671533249316823">"自分(%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"プロファイル情報"</string>
     <string name="user_name_label" msgid="3210832645046206845">"名前"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"セットアップしていません"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"ユーザー名の編集"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ユーザーとアカウント"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ユーザー"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> のアカウント"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"再試行"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"スキップ"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"画面ロックの設定"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"パターンの選択"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"現在の画面ロック"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"セキュリティ強化のためにパターンを設定"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"消去"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"画面ロックを解除しますか?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"解除すると、誰でもアカウントにアクセスできるようになります"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN の入力"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"パスワードの入力"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"セキュリティ強化のために PIN を設定"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"PIN の再入力"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN は 4 桁以上にしてください"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN が無効です。4 桁以上にしてください。"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN が一致しません"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN の保存中にエラーが発生しました"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN が間違っています"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"パスワードが正しくありません"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"セキュリティ強化のためにパスワードを設定"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"パスワードの再入力"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"パスワードが一致しません"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"キャンセル"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace キー"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter キー"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"デモを終了しますか?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"デモアカウントを削除し、デモモードを終了すると、出荷時設定へのリセットが必要になります"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"デモを終了"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"デモモードの終了"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"デモアカウントが削除され、システムが出荷時の設定にリセットされます。すべてのユーザーデータは失われます。"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"デモを終了"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"設定を完了"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"後で行う"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"この操作は運転中はできません。"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 617d3d2..5a0aae8 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"სტუმარი"</string>
     <string name="user_switch" msgid="6544839750534690781">"გადართვა"</string>
     <string name="current_user_name" msgid="3813671533249316823">"თქვენ (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"ინფორმაცია პროფილზე"</string>
     <string name="user_name_label" msgid="3210832645046206845">"სახელი"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"არ არის დარეგულირებული"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"მომხმარებლის სახელის რედაქტირება"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"მომხმარებლები და ანგარიშები"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"მომხმარებელი"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>-ის ანგარიშები"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ხელახლა ცდა"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"გამოტოვება"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"ეკრანის დაბლოკვის მეთოდის დაყენება"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"აირჩიეთ განმბლოკავი ნიმუში"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"ეკრანის დაბლოკვის ამჟამინდელი მეთოდი"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"უსაფრთხოებისთვის, დააყენეთ განსაბლოკი ნიმუში"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"გასუფთავება"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"კარგი"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"გაუქმდეს ეკრანის დაბლოკვა?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"ეს ქმედება ხელმისაწვდომს გახდის თქვენს ანგარიშს ყველასთვის"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"შეიყვანეთ PIN-კოდი"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"შეიყვანეთ პაროლი"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"უსაფრთხოებისთვის, დააყენეთ PIN-კოდი"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"ხელახლა შეიყვანეთ თქვენი PIN-კოდი"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-კოდი მინიმუმ 4 ციფრისგან უნდა შედგებოდეს"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN-კოდი არასწორია, უნდა შეიცავდეს მინიმუმ 4 ციფრს."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-კოდები არ ემთხვევა"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN-კოდის შენახვისას მოხდა შეცდომა"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN-კოდი არასწორია"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"პაროლი არასწორია"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"უსაფრთხოებისთვის, დააყენეთ პაროლი"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"ხელახლა შეიყვანეთ თქვენი პაროლი"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"პაროლები არ ემთხვევა"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"გაუქმება"</string>
     <string name="backspace_key" msgid="1545590866688979099">"უკუშლის კლავიში"</string>
     <string name="enter_key" msgid="2121394305541579468">"კლავიში Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"გსურთ დემოს დატოვება?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"დემო ანგარიშის წაშლისა და დემო რეჟიმის დატოვებისთვის საჭიროა ქარხნულ პარამეტრებზე დაბრუნება"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"დემოს დატოვება"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"დემო-რეჟიმის დატოვება"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ეს ქმედება წაშლის დემო-ანგარიშს და სისტემის ქარხნულ მონაცემებს აღადგენს. სამომხმარებლო მონაცემები მთლიანად წაიშლება."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"დემოს დატოვება"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"დაყენების დასრულება"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ახლა არა"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ქმედება მიუწვდომელია მანქანის მართვისას."</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 16dfaec..e437d6d 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Қонақ"</string>
     <string name="user_switch" msgid="6544839750534690781">"Ауысу"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Сіз (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Профильдік ақпарат"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Аты"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Реттелмеген"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Пайдаланушы атын өзгерту"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Пайдаланушылар мен есептік жазбалар"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Пайдаланушы"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> атты пайдаланушының есептік жазбалары"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Қайталау"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Өткізіп жіберу"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Экранды құлыптауды орнатыңыз"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Өрнегіңізді жасаңыз"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Ағымдағы экран құлпы"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Қауіпсіздік үшін өрнекті орнатыңыз"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Өшіру"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Жарайды"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Экран құлпы өшірілсін бе?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Кез келген адам есептік жазбаңызға кіре алатын болады"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN кодын енгізіңіз"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Құпия сөзіңізді енгізіңіз"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Қауіпсіздік үшін PIN кодын орнатыңыз"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"PIN кодын қайта енгізіңіз"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN коды кемінде 4 таңбадан тұруы керек"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN коды жарамсыз: кемінде 4 сан болуы керек."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN кодтары сәйкес емес"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN кодын сақтау кезінде қате кетті"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN коды қате"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Құпия сөз қате"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Қауіпсіздік үшін құпия сөз орнатыңыз"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Құпия сөзді қайта енгізіңіз"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Құпия сөздер сәйкес емес"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Бас тарту"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace пернесі"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter пернесі"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Деморежимнен шығасыз ба?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Демо есептік жазбаны жою және деморежимнен шығу үшін зауыттық мәндерді қайтару керек"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Деморежимнен шығу"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Деморежимнен шығу"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Демо есептік жазбаңыз жойылады және жүйенің зауыттық деректері қалпына келтіріледі. Пайдаланушының барлық деректері жоғалады."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Деморежимнен шығу"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"реттеуді аяқтау"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"қазір емес"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Бұл әрекет көлік жүргізу кезінде қолжетімді болмайды."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index f39e648..06bd295 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"ភ្ញៀវ"</string>
     <string name="user_switch" msgid="6544839750534690781">"ប្ដូរ"</string>
     <string name="current_user_name" msgid="3813671533249316823">"អ្នក (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"ព័ត៌មាន​ក្នុង​កម្រងព័ត៌មាន"</string>
     <string name="user_name_label" msgid="3210832645046206845">"ឈ្មោះ"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"មិន​បាន​រៀបចំ"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"កែសម្រួល​ឈ្មោះអ្នក​ប្រើប្រាស់"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"អ្នកប្រើប្រាស់ និងគណនី"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"អ្នក​ប្រើប្រាស់"</string>
     <string name="account_list_title" msgid="7631588514613843065">"គណនី​សម្រាប់ <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ព្យាយាមម្ដងទៀត"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"រំលង"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"កំណត់​ការចាក់​សោអេក្រង់"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"ជ្រើស​រើសលំនាំ​របស់​អ្នក"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"ការចាក់សោអេក្រង់បច្ចុប្បន្ន"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"ដើម្បីសុវត្ថិភាព សូមកំណត់លំនាំ"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"សម្អាត"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"យល់ព្រម"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"លុប​ការ​ចាក់សោ​អេក្រង់?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"វា​នឹង​អនុញ្ញាត​ឱ្យ​នរណា​ម្នាក់​ចូល​ប្រើ​គណនី​របស់អ្នក"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"បញ្ចូល​កូដ PIN របស់​អ្នក"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"ដើម្បី​សុវត្ថិភាព សូម​កំណត់​កូដ PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"បញ្ចូល​កូដ PIN របស់អ្នក​ឡើងវិញ"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"កូដ PIN ត្រូវតែ​មាន​លេខ​យ៉ាង​ហោច​ណាស់ 4 ខ្ទង់"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"កូដ PIN មិនត្រឹមត្រូវ​ទេ ត្រូវ​មាន​លេខ​យ៉ាង​ហោច​ណាស់ 4 ខ្ទង់។"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"កូដ PIN មិន​ត្រូវគ្នាទេ"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"មាន​បញ្ហា​ក្នុងការ​រក្សាទុក​កូដ PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"កូដ PIN មិន​ត្រឹមត្រូវ​"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​ទេ"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"ដើម្បី​សុវត្ថិភាព សូម​កំណត់​ពាក្យសម្ងាត់"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក​​ឡើងវិញ"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"ពាក្យសម្ងាត់​មិន​ត្រូវ​គ្នាទេ"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"បោះបង់"</string>
     <string name="backspace_key" msgid="1545590866688979099">"គ្រាប់​ចុច​លុប"</string>
     <string name="enter_key" msgid="2121394305541579468">"គ្រាប់​ចុច​បញ្ចូល"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ចាក​ចេញ​ពីការបង្ហាញ​សាកល្បង​មែនទេ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ការ​លុប​គណនី​សាកល្បង និង​ការ​ចាកចេញពីមុខងារ​សាកល្បង​នឹង​តម្រូវ​ឱ្យ​មាន​ការ​កំណត់​ដូច​ដើម​ឡើង​វិញ"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ចាក​ចេញ​ពីការបង្ហាញ​សាកល្បង"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ចាក​ចេញ​ពីមុខងារបង្ហាញ​សាកល្បង"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ការចាកចេញ​នេះ​នឹង​លុប​គណនីបង្ហាញ​សាកល្បង និងកំណត់​ទិន្នន័យប្រព័ន្ធ​ដូច​ចេញ​ពី​រោងចក្រ។​ ទិន្នន័យ​អ្នក​ប្រើប្រាស់​ទាំងអស់​នឹង​បាត់បង់។"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ចាក​ចេញ​ពីការបង្ហាញ​សាកល្បង"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"បញ្ចប់​ការរៀបចំ"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"កុំ​ទាន់"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"មិនមាន​សកម្មភាព​ទេ ខណៈពេល​កំពុង​បើកបរ។"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 7691703..e387631 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"ಅತಿಥಿ"</string>
     <string name="user_switch" msgid="6544839750534690781">"ಬದಲಿಸಿ"</string>
     <string name="current_user_name" msgid="3813671533249316823">"ನೀವು (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"ಪ್ರೊಫೈಲ್‌‌ ಮಾಹಿತಿ"</string>
     <string name="user_name_label" msgid="3210832645046206845">"ಹೆಸರು"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"ಇನ್ನೂ ಸೆಟಪ್‌ ಮಾಡಿಲ್ಲ"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ಬಳಕೆದಾರರು ಮತ್ತು ಖಾತೆಗಳು"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ಬಳಕೆದಾರ"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> ಅವರಿಗಾಗಿ ಖಾತೆಗಳು"</string>
@@ -194,24 +195,21 @@
     <string name="user_add_user_message_update" msgid="1528170913388932459">"ಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಬಹುದು."</string>
     <string name="security_settings_title" msgid="6955331714774709746">"ಭದ್ರತೆ"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"ಪರದೆ ಲಾಕ್"</string>
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"ಯಾವುದೂ ಅಲ್ಲ"</string>
     <string name="security_lock_pattern" msgid="1174352995619563104">"ಪ್ಯಾಟರ್ನ್"</string>
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"ಪಿನ್"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"ಲಾಕ್ ಪ್ರಕಾರವನ್ನು ಆರಿಸಿ"</string>
     <string name="screen_lock_options" msgid="7023338635352915768">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಗಳು"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ನಮೂದಿಸಿ"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"ದೃಢೀಕರಿಸಿ"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"ಮರುರಚಿಸಿ"</string>
     <string name="continue_button_text" msgid="5129979170426836641">"ಮುಂದುವರಿಸಿ"</string>
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ಮರುಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"ಸ್ಕಿಪ್"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"ಪರದೆ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"ಪ್ಯಾಟರ್ನ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"ಪ್ರಸ್ತುತ ಸ್ಕ್ರೀನ್ ಲಾಕ್"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪ್ಯಾಟ್ರನ್ ಹೊಂದಿಸಿ"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="lockpattern_cancel_button_text" msgid="4068764595622381766">"ರದ್ದುಮಾಡಿ"</string>
@@ -225,16 +223,18 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ರಚಿಸುವುದು ಹೇಗೆ"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"ಪ್ಯಾಟರ್ನ್‌ ಉಳಿಸುವಲ್ಲಿ ದೋಷ"</string>
     <string name="okay" msgid="4589873324439764349">"ಸರಿ"</string>
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
-    <skip />
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ತೆಗೆದುಹಾಕಿ"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"ಇದು ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಯಾರಾದರೂ ಪ್ರವೇಶಿಸಲು ಅನುಮತಿಸುತ್ತದೆ"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸಿ"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಮರು ನಮೂದಿಸಿ"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"ಪಿನ್ ಕನಿಷ್ಠ 4 ಅಂಕಿಗಳಾಗಿರಬೇಕು"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"ಪಿನ್ ಅಮಾನ್ಯವಾಗಿದೆ, ಕನಿಷ್ಠ 4 ಅಂಕೆಗಳು ಇರಬೇಕು."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"ಪಿನ್‌ಗಳು ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"ಪಿನ್‌ ಉಳಿಸುವಲ್ಲಿ ದೋಷ"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"ತಪ್ಪಾದ ಪಿನ್‌"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"ಪಾಸ್‌ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಮರು ನಮೂದಿಸಿ"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ"</string>
@@ -286,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"ರದ್ದುಮಾಡಿ"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace ಕೀ"</string>
     <string name="enter_key" msgid="2121394305541579468">"ಕೀಲಿಯನ್ನು ನಮೂದಿಸಿ"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ಡೆಮೊ ನಿರ್ಗಮಿಸುವುದೇ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ಡೆಮೊ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಮತ್ತು ಡೆಮೊ ಮೋಡ್‌ನಿಂದ ನಿರ್ಗಮಿಸುವುದಕ್ಕೆ ಫ್ಯಾಕ್ಟ್ರಿ ರಿಸೆಟ್‌ನ ಅಗತ್ಯವಿದೆ"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ಡೆಮೊದಿಂದ ನಿರ್ಗಮಿಸಿ"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ಡೆಮೊ ಮೋಡ್‌ನಿಂದ ನಿರ್ಗಮಿಸಿ"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ಇದು ಡೆಮೊ ಖಾತೆಯನ್ನು ಅಳಿಸುತ್ತದೆ ಮತ್ತು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಸಿಸ್ಟಂ ಅನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಬಳಕೆದಾರ ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ಡೆಮೊದಿಂದ ನಿರ್ಗಮಿಸಿ"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಿ"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ಈಗಲೇ ಬೇಡ"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ಚಾಲನೆ ಮಾಡುವಾಗ ಕ್ರಿಯೆ ಲಭ್ಯವಿಲ್ಲ."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2b38617..f7edc9c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"게스트"</string>
     <string name="user_switch" msgid="6544839750534690781">"전환"</string>
     <string name="current_user_name" msgid="3813671533249316823">"사용자(%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"프로필 정보"</string>
     <string name="user_name_label" msgid="3210832645046206845">"이름"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"설정되지 않음"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"사용자 이름 수정"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"사용자 및 계정"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"사용자"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>님의 계정"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"다시 시도"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"건너뛰기"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"화면 잠금 설정"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"패턴 선택"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"현재 화면 잠금"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"보안을 위해 패턴을 설정하세요."</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"삭제"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"확인"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"화면 잠금을 삭제하시겠습니까?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"화면 잠금을 삭제하면 누구나 계정에 액세스할 수 있습니다."</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN 입력"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"비밀번호 입력"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"보안을 위해 PIN을 설정하세요."</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"PIN 다시 입력"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN은 4자리 이상이어야 합니다."</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN이 잘못되었습니다. 4자리 이상이어야 합니다."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN이 일치하지 않음"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN 저장 중 오류 발생"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"잘못된 PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"잘못된 비밀번호"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"보안을 위해 비밀번호를 설정하세요."</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"비밀번호 다시 입력"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"비밀번호가 일치하지 않음"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"취소"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace 키"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter 키"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"데모를 종료하시겠습니까?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"데모 계정을 삭제하거나 데모 모드를 종료하려면 기기를 초기화해야 합니다."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"데모 종료"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"데모 모드 종료"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"데모 계정을 삭제하고 시스템을 초기화합니다. 사용자 데이터는 모두 사라집니다."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"데모 종료"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"설정 완료"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"나중에"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"운전 중 작업 불가"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 5c59229..c01a6c9 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Конок"</string>
     <string name="user_switch" msgid="6544839750534690781">"Которуштуруу"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Сиз (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Профилдин чоо-жайы"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Колдонуучунун аты"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Түзүлгөн жок"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Колдонуучунун атын түзөтүү"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Колдонуучулар жана аккаунттар"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Колдонуучу"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> аттуу колдонуучунун аккаунттары"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Кайталоо"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Өткөрүп жиберүү"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Экран кулпусун коюп алыңыз"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Графикалык ачкычты тандаңыз"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Учурдагы экран кулпусу"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Коопсуздук үчүн графикалык ачкыч коюңуз"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Тазалоо"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Жарайт"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Экран кулпусу өчүрүлсүнбү?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Ушуну менен аккаунтуңузга каалаган киши кире берет"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN кодуңузду киргизиңиз"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Сырсөзүңүздү киргизиңиз"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Коопсуздук үчүн PIN код коюп алыңыз"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"PIN кодуңузду кайра киргизиңиз"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN код кеминде 4 сандан турушу керек"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pin код жараксыз, кеминде 4 сандан турушу керек."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN коддор дал келген жок"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN кодду сактоо катасы"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN код туура эмес"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Сырсөз туура эмес"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Коопсуздук үчүн сырсөз коюп алыңыз"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Сырсөзүңүздү кайра киргизиңиз"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Сырсөздөр дал келген жок"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Жокко чыгаруу"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace баскычы"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter баскычы"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Демо версиядан чыгасызбы?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Демо аккаунт менен учурдагы демо режимди жок кылуу үчүн баштапкы жөндөөлөргө кайтаруу талап кылынат"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Демо режимден чыгуу"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Демо режимден чыгасызбы?"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ушуну менен демо аккаунт жок кылынып, тутум кайра башынан жөндөлөт. Колдонуучунун бардык дайындары өчүрүлөт."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Демо режимден чыгуу"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"жөндөөнү бүтүрүү"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"азыр эмес"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Унаа айдаганда бул аракетти аткарууга болбойт."</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 7978c31..57049ba 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"ແຂກ"</string>
     <string name="user_switch" msgid="6544839750534690781">"ສະຫຼັບ"</string>
     <string name="current_user_name" msgid="3813671533249316823">"ທ່ານ (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"ຂໍ້ມູນໂປຣໄຟລ໌"</string>
     <string name="user_name_label" msgid="3210832645046206845">"ຊື່"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"ບໍ່ໄດ້ຕັ້ງຄ່າ"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"ແກ້ໄຊຊື່ຜູ້ໃຊ້"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ຜູ້ໃຊ້ ແລະ ບັນຊີ"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ຜູ້ໃຊ້"</string>
     <string name="account_list_title" msgid="7631588514613843065">"ບັນຊີສຳລັບ <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ລອງໃໝ່"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"ຂ້າມ"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"ຕັ້ງຄ່າໜ້າຈໍລັອກ"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"ເລືອກຮູບແບບຂອງທ່ານ"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"ການລັອກໜ້າຈໍປັດຈຸບັນ"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"ເພື່ອຄວາມປອດໄພ, ກະລຸນາຕັ້ງຮູບແບບປົດລັອກ"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"ລຶບ"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"ຕົກລົງ"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"ລຶບການລັອກໜ້າຈໍອອກບໍ?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"ນີ້ຈະອະນຸຍາດໃຫ້ທຸກຄົນເຂົ້າເຖິງບັນຊີຂອງທ່ານໄດ້"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"ປ້ອນ PIN ຂອງທ່ານ"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"ປ້ອນລະຫັດຜ່ານຂອງທ່ານ"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"ເພື່ອຄວາມປອດໄພ, ກະລຸນາຕັ້ງລະຫັດ PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"ປ້ອນ PIN ຂອງທ່ານຄືນໃໝ່"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN ຕ້ອງມີຢ່າງໜ້ອຍ 4 ຕົວເລກ"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pin ບໍ່ຖືກຕ້ອງ, ຕ້ອງມີຢ່າງໜ້ອຍ 4 ຕົວເລກ."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN ບໍ່ກົງກັນ"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"ເກີດຄວາມຜິດພາດໃນການບັນທຶກ PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN ບໍ່ຖືກຕ້ອງ"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"ເພື່ອຄວາມປອດໄພ, ກະລຸນາຕັ້ງລະຫັດຜ່ານ"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"ປ້ອນລະຫັດຜ່ານຂອງທ່ານຄືນໃໝ່"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"ລະຫັດຜ່ານບໍ່ກົງກັນ"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"ຍົກເລີກ"</string>
     <string name="backspace_key" msgid="1545590866688979099">"ປຸ່ມລຶບກັບຫຼັງ"</string>
     <string name="enter_key" msgid="2121394305541579468">"ປຸ່ມເອັນເທີ"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ອອກຈາກໂໝດສາທິດບໍ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ການລຶບບັນຊີສາທິດ ແລະ ອອກຈາກໂໝດສາທິດຈະຈຳເປັນຕ້ອງມີການຣີເຊັດເປັນຄ່າໂຮງງານ"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ອອກຈາກໂໝດສາທິດ"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ອອກຈາກໂໝດສາທິດ"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ນີ້ຈະລຶບບັນຊີສາທິດ ແລະ ຣີເຊັດລະບົບເປັນຂໍ້ມູນໂຮງງານ. ຂໍ້ມູນຜູ້ໃຊ້ທັງໝົດຈະເສຍໄປ."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ອອກຈາກໂໝດສາທິດ"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ສຳເລັດການຕັ້ງຄ່າ"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ບໍ່ແມ່ນຕອນນີ້"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ບໍ່ສາມາດດຳເນີນການໄດ້ໃນຂະນະທີ່ຂັບຂີ່ຢູ່."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6ab9fd6..4d30774 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Svečias"</string>
     <string name="user_switch" msgid="6544839750534690781">"Jungiklis"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Jūs (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profilio informacija"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Vardas"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nenustatyta"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Naudotojo vardo redagavimas"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Naudotojai ir paskyros"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Naudotojas"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Paskyros (<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>)"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Bandyti dar kartą"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Praleisti"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ekrano užrakto nustatymas"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Pasirinkite piešinį"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Esamas ekrano užraktas"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Nustatykite saugumo atrakinimo piešinį"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Išvalyti"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"Gerai"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Pašalinti ekrano užraktą?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Tai atlikus visi žmonės galės pasiekti jūsų paskyrą"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Įveskite PIN kodą"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Įveskite slaptažodį"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Saugumo PIN kodo nustatymas"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Įveskite PIN kodą iš naujo"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN kodą turi sudaryti bent 4 skaitmenys"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN kodas netinkamas; jis turi būti sudarytas bent iš 4 skaitmenų."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN kodai nesutampa"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Klaida išsaugant PIN kodą"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Netinkamas PIN kodas"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Netinkamas slaptažodis"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Saugumo slaptažodžio nustatymas"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Įveskite slaptažodį iš naujo"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Slaptažodžiai nesutampa"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"Atšaukti"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Naikinimo klavišas"</string>
     <string name="enter_key" msgid="2121394305541579468">"Klavišas „Enter“"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Išeiti iš dem. režimo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Jei ištrinsite dem. paskyrą ir išeisite iš demonstracinio rež., reikės atkurti gamyklinius duomenis"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Išeiti iš dem. režimo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Išeiti iš demonstrac. režimo"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tai atlikus bus ištrinta demonstracinė paskyra ir atkurti gamykliniai sistemos duomenys. Visi naudotojo duomenys bus prarasti."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Išeiti iš dem. režimo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"užbaigti sąranką"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ne dabar"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Veiksmo negalima atlikti vairuojant."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index bfecb0c..e2766b9 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -174,9 +174,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Viesis"</string>
     <string name="user_switch" msgid="6544839750534690781">"Pārslēgt"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Jūs (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profila informācija"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Vārds"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nav iestatīts"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Lietotāja vārda rediģēšana"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Lietotāji un konti"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Lietotājs"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Lietotāja <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> konti"</string>
@@ -208,6 +208,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Mēģināt vēlreiz"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Izlaist"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ekrāna bloķēšanas iestatīšana"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Kombinācijas izvēle"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Pašreizējais ekrāna bloķēšanas veids"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Drošības nolūkos iestatiet kombināciju."</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Notīrīt"</string>
@@ -224,12 +225,16 @@
     <string name="okay" msgid="4589873324439764349">"Labi"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Vai noņemt ekrāna bloķēšanu?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Tādējādi ikviens varēs piekļūt jūsu kontam."</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN ievade"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Ievadiet savu paroli"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Drošības nolūkos iestatiet PIN."</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Atkārtota PIN koda ievade"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN kodā ir jābūt vismaz 4 cipariem."</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN nav derīgs. Tajā ir jābūt vismaz 4 cipariem."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN kodi nav vienādi"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Saglabājot PIN, radās kļūda."</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Nepareizs PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Nepareiza parole"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Drošības nolūkos iestatiet paroli."</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Atkārtota paroles ievade"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Paroles nav vienādas"</string>
@@ -287,8 +292,10 @@
     <string name="cancel" msgid="750286395700355455">"Atcelt"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Atkāpšanās taustiņš"</string>
     <string name="enter_key" msgid="2121394305541579468">"Ievadīšanas taustiņš"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Vai iziet no dem. režīma?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Lai dzēstu demonstrācijas kontu un izietu no demonstrācijas režīma, jāatiestata rūpnīcas dati."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Iziet no demonstr. režīma"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Iziešana no demonstr. režīma"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tādējādi tiks dzēsts demonstrācijas konts un sistēmā tiks atiestatīti rūpnīcas dati. Visi lietotāja dati tiks zaudēti."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Iziet no demonstr. režīma"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"pabeigt iestatīšanu"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"vēlāk"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Darbība nav pieejama braukšanas laikā."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6105876..322ed7a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Гостин"</string>
     <string name="user_switch" msgid="6544839750534690781">"Префрли"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Вие (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Информации за профил"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Име"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Не е поставен"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Изменување на корисничкото име"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Корисници и сметки"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Корисник"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Сметки за <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Повторно"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Прескокни"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Поставете заклучување екран"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Изберете шема"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Тековно заклучување на екранот"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"За безбедност, поставете шема"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Исчисти"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Во ред"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Отстрани заклучување екран?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Ова ќе овозможи секој да пристапува до вашата сметка"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Внесете го PIN-кодот"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Внесете ја лозинката"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"За безбедност, поставете PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Внесете го PIN-кодот повторно"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-кодот мора да има најмалку 4 цифри"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN-кодот е неважечки. Мора да има барем 4 цифри."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-кодовите не се совпаѓаат"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Грешка при зачувување PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Погрешен PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Погрешна лозинка"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"За безбедност, поставете лозинка"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Внесете ја лозинката повторно"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Лозинките не се совпаѓаат"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Откажи"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Копче Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Копче Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Да се излезе од демо?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"За да ја избришете демо-сметката и да излезете од демо-режимот, потребно е фабричко ресетирање"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Излези од демо-режим"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Излез од демо-режим"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ова ќе ја избрише демо-сметката и ќе ги ресетира фабричките податоци на системот. Сите податоци на корисникот ќе се изгубат."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Излези од демо-режим"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"заврши со поставување"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"не сега"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Дејството не е достапно при возење."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 8a401ad..c19baff 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"അതിഥി"</string>
     <string name="user_switch" msgid="6544839750534690781">"മാറുക"</string>
     <string name="current_user_name" msgid="3813671533249316823">"നിങ്ങൾ (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"പ്രൊഫൈൽ വിവരം"</string>
     <string name="user_name_label" msgid="3210832645046206845">"പേര്"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"സജ്ജീകരിച്ചിട്ടില്ല"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ഉപയോക്താക്കളും അക്കൗണ്ടുകളും"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ഉപയോക്താവ്"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> എന്ന ഉപയോക്താവിന്റെ അക്കൗണ്ടുകൾ"</string>
@@ -194,24 +195,21 @@
     <string name="user_add_user_message_update" msgid="1528170913388932459">"ഏതൊരു ഉപയോക്താവിനും മറ്റെല്ലാ ഉപയോക്താക്കൾക്കുമായി ആപ്പുകൾ അപ്‌ഡേറ്റ് ചെയ്യാനാവും."</string>
     <string name="security_settings_title" msgid="6955331714774709746">"സുരക്ഷ"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"സ്ക്രീൻ ലോക്ക്"</string>
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"ഒന്നുമില്ല"</string>
     <string name="security_lock_pattern" msgid="1174352995619563104">"പാറ്റേൺ"</string>
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"പിൻ"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"പാസ്‌വേഡ്"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"ഒരു ലോക്ക് ടൈപ്പ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="screen_lock_options" msgid="7023338635352915768">"സ്‌ക്രീൻ ലോക്ക് ഓപ്ഷനുകള്‍"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"നിങ്ങളുടെ പാറ്റേൺ നൽകുക"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"സ്ഥിരീകരിക്കുക"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"വീണ്ടും വരയ്ക്കുക"</string>
     <string name="continue_button_text" msgid="5129979170426836641">"തുടരുക"</string>
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"ഒഴിവാക്കുക"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"ഒരു സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കുക"</string>
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"പാറ്റേൺ തിരഞ്ഞെടുക്കൂ"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"നിലവിലെ സ്‌ക്രീൻ ലോക്ക്"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"സുരക്ഷയ്‌ക്കായി, പാറ്റേൺ സജ്ജീകരിക്കുക"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"മായ്ക്കുക"</string>
     <string name="lockpattern_cancel_button_text" msgid="4068764595622381766">"റദ്ദാക്കുക"</string>
@@ -225,16 +223,18 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"ഒരു അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതെങ്ങനെ"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"പാറ്റേൺ സംരക്ഷിക്കുന്നതിൽ പിശക്"</string>
     <string name="okay" msgid="4589873324439764349">"ശരി"</string>
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
-    <skip />
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"സ്‌ക്രീൻ ലോക്ക് നീക്കം ചെയ്യണോ?"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"ഇത് നിങ്ങളുടെ അക്കൗണ്ട് ആർക്കും ആക്‌സസ് ചെയ്യാൻ അനുവദിക്കും"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"പിൻ നൽകുക"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"നിങ്ങളുടെ പാസ്‌വേഡ് നല്‍‌കുക"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"സുരക്ഷയ്‌ക്കായി, ഒരു പിൻ സജ്ജമാക്കുക"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"നിങ്ങളുടെ പിൻ വീണ്ടും നൽകുക"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"പിൻ നമ്പറിൽ 4 അക്കങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"അസാധുവായ പിൻ, 4 അക്കങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"പിന്നുകൾ പൊരുത്തപ്പെടുന്നില്ല"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"പിൻ സംരക്ഷിക്കുന്നതിൽ പിശക്"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"പിൻ തെറ്റാണ്"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"പാസ്‌വേഡ് തെറ്റാണ്"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"സുരക്ഷയ്‌ക്കായി, പാസ്‌വേഡ് സജ്ജമാക്കുക"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"നിങ്ങളുടെ പാസ്‌വേഡ് വീണ്ടും നൽകുക"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"പാസ്‌വേഡ് പൊരുത്തപ്പെടുന്നില്ല"</string>
@@ -286,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"റദ്ദാക്കുക"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace കീ"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter കീ"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ഡെമോയിൽ നിന്ന് പുറത്തുകടക്കണോ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ഡെമോ അക്കൗണ്ട് ഇല്ലാതാക്കുന്നതിനും ഡെമോ മോഡിൽ നിന്ന് പുറത്ത് കടക്കുന്നതിനും ഫാക്ടറി പുനഃസജ്ജീകരണം ആവശ്യമായി വരും"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ഡെമോയിൽ നിന്ന് പുറത്തുകടക്കുക"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ഡെമോ മോഡിൽ നിന്ന് പുറത്തുകടക്കുക"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ഇത് ഡെമോ അക്കൗണ്ട് ഇല്ലാതാക്കുകയും സിസ്‌റ്റം ഫാക്‌ടറി ഡാറ്റ പുനഃക്രമീകരിക്കുകയും ചെയ്യും. എല്ലാ ഉപയോക്തൃ ഡാറ്റയും നഷ്‌ടമാവും."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ഡെമോയിൽ നിന്ന് പുറത്തുകടക്കുക"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"സജ്ജീകരണം പൂർത്തിയാക്കുക"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ഇപ്പോൾ വേണ്ട"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ഡ്രൈവ് ചെയ്യുമ്പോൾ പ്രവർത്തനം ലഭ്യമല്ല."</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index fad2e2e..192e0db 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Зочин"</string>
     <string name="user_switch" msgid="6544839750534690781">"Сэлгэх"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Та (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Профайлын мэдээлэл"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Нэр"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Тохируулаагүй"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Хэрэглэгчийн нэрийг засах"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Хэрэглэгчид &amp; бүртгэлүүд"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Хэрэглэгч"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>-н бүртгэл"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Дахин оролдох"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Алгасах"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Дэлгэцийн түгжээ тохируулах"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Хээгээ сонгоно уу"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Одоогийн дэлгэцийн түгжээ"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Аюулгүй байдлын үүднээс загвар тохируулах"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Устгах"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"ОК"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Дэлгэцийн түгжээг хасах уу?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Ингэснээр хүн бүхэн таны бүртгэлд хандах боломжтой болно"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"ПИН кодоо оруулна уу"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Нууц үгээ оруулна уу"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Аюулгүй байдлын үүднээс ПИН тохируулах"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"ПИН-ээ дахин оруулах"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"ПИН хамгийн багадаа 4 оронтой цифр байх ёстой"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Пин буруу байна. Хамгийн багадаа 4 цифр байх ёстой."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"ПИН таарахгүй байна"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"ПИН-г хадгалахад алдаа гарлаа"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"ПИН код буруу байна"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Нууц үг буруу байна"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Аюулгүй байдлын үүднээс нууц үг тохируулах"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Нууц үгээ дахин оруулах"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Нууц үг таарахгүй байна"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Цуцлах"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Ухраах түлхүүр"</string>
     <string name="enter_key" msgid="2121394305541579468">"Oруулах түлхүүр"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Туршилтаас гарах уу?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Туршилтын бүртгэлийг устгах болон туршилтын горимоос гарахад үйлдвэрийн шинэчлэлт шаардлагатай болно"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Туршилтаас гарах"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Туршилтын горимоос гарах"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Энэ нь туршилтын бүртгэлийг устгах бөгөөд системийг үйлдвэрээс гарсан төлөвт шинэчилнэ. Хэрэглэгчийн бүх өгөгдөл устах болно."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Туршилтаас гарах"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"тохиргоог дуусгах"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"одоо биш"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Жолоо барьж байх үед тус үйлдлийг хийх боломжгүй."</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index fa13539..dd6e9ce 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"अतिथी"</string>
     <string name="user_switch" msgid="6544839750534690781">"स्विच"</string>
     <string name="current_user_name" msgid="3813671533249316823">"तुम्ही (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"प्रोफाइल माहिती"</string>
     <string name="user_name_label" msgid="3210832645046206845">"नाव"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"सेट केलेले नाही"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"वापरकर्ते आणि खाती"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"वापरकर्ता"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> साठी खाती"</string>
@@ -194,24 +195,21 @@
     <string name="user_add_user_message_update" msgid="1528170913388932459">"कोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अॅप्स अपडेट करू शकतो."</string>
     <string name="security_settings_title" msgid="6955331714774709746">"सुरक्षितता"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"स्क्रीन लॉक"</string>
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"काहीही नाही"</string>
     <string name="security_lock_pattern" msgid="1174352995619563104">"पॅटर्न"</string>
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"पिन"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"पासवर्ड"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"लॉक प्रकार निवडा"</string>
     <string name="screen_lock_options" msgid="7023338635352915768">"स्क्रीन लॉक पर्याय"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"तुमचा पॅटर्न एंटर करा"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"खात्री करा"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"पुन्हा रेखाटा"</string>
     <string name="continue_button_text" msgid="5129979170426836641">"सुरू ठेवा"</string>
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"पुन्हा प्रयत्न करा"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"वगळा"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"स्क्रीन लॉक सेट करा"</string>
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"तुमचा पॅटर्न निवडा"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"सध्‍याचा स्क्रीन लॉक"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"सुरक्षिततेसाठी, एक पॅटर्न सेट करा"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"साफ करा"</string>
     <string name="lockpattern_cancel_button_text" msgid="4068764595622381766">"रद्द करा"</string>
@@ -225,16 +223,18 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"अनलॉक पॅटर्न कसा काढावा"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"पॅटर्न सेव्ह करताना एरर आली"</string>
     <string name="okay" msgid="4589873324439764349">"ठीक आहे"</string>
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
-    <skip />
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"स्क्रीन लॉक काढायचा?"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"तुमचे खाते अॅक्‍सेस करण्‍यासाठी हे कुणालाही अनुमती देते"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"तुमचा पिन एंटर करा"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"तुमचा पासवर्ड एंटर करा"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"सुरक्षिततेसाठी पिन सेट करा"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"तुमचा पिन पुन्हा एंटर करा"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"पिन किमान ४ अंकांचा असणे आवश्यक आहे"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"पिन चुकीचा आहे, किमान ४ अंक असणे आवश्‍यक आहे."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"पिन जुळत नाहीत"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"पिन सेव्ह करताना एरर आली"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"चुकीचा पिन"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"चुकीचा पासवर्ड"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"सुरक्षिततेसाठी पासवर्ड सेट करा"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"तुमचा पासवर्ड पुन्‍हा एंटर करा"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"पासवर्ड जुळत नाहीत"</string>
@@ -286,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"रद्द करा"</string>
     <string name="backspace_key" msgid="1545590866688979099">"बॅकस्‍पेस की"</string>
     <string name="enter_key" msgid="2121394305541579468">"की एंटर करा"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"डेमो मोडमधून बाहेर यायचे?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"डेमो खाते हटवण्‍यासाठी आणि डेमो मोडमधून बाहेर पडण्‍यासाठी फॅक्‍टरी रीसेट आवश्‍यक असेल"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"डेमो मोडमधून बाहेर पडा"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"डेमो मोडमधून बाहेर पडा"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"हे डेमो खाते हटवेल आणि फॅक्टरी डेटा सिस्टम रीसेट करेल. सर्व वापरकर्ता डेटा गमावेल."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"डेमो मोडमधून बाहेर पडा"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"सेटअप समाप्त करा"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"आता नाही"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ड्रायव्हिंग करत असताना कृती उपलब्‍ध नाही."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 97a57df..446ccd5 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Tetamu"</string>
     <string name="user_switch" msgid="6544839750534690781">"Tukar"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Anda (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Maklumat profil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nama"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Tidak disediakan"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Edit nama pengguna"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Pengguna &amp; akaun"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Pengguna"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Akaun untuk <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Cuba semula"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Langkau"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Tetapkan kunci skrin"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Pilih corak anda"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Kunci skrin semasa"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Untuk keselamatan, tetapkan corak"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Kosongkan"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Alih keluar kunci skrin?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Tindakan ini membenarkan sesiapa sahaja mengakses akaun anda"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Masukkan PIN anda"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Masukkan kata laluan anda"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Untuk keselamatan, tetapkan PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Masukkan semula PIN anda"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN mestilah sekurang-kurangnya 4 digit"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pin tidak sah, mesti sekurang-kurangnya 4 digit."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN tidak sepadan"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Ralat semasa menyimpan PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN salah"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Kata laluan salah"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Untuk keselamatan, tetapkan kata laluan"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Masukkan semula kata laluan anda"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Kata laluan tidak sepadan"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Batal"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Kekunci undur ruang"</string>
     <string name="enter_key" msgid="2121394305541579468">"Kekunci enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Keluar daripada Demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Pemadaman akaun demo dan tindakan keluar daripada mod demo memerlukan tetapan semula kilang"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Keluar drpd Tunjuk Cara"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Keluar drpd mod tunjuk cara"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tindakan ini akan memadamkan akaun tunjuk cara dan membuat tetapan semula data kilang pada sistem. Semua data pengguna akan hilang."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Keluar drpd Tunjuk Cara"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"selesaikan persediaan"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"bukan sekarang"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Tindakan tidak tersedia semasa memandu."</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 2924ec1..2c77b71 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"ဧည့်သည်"</string>
     <string name="user_switch" msgid="6544839750534690781">"ပြောင်းရန်"</string>
     <string name="current_user_name" msgid="3813671533249316823">"သင် (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"ပရိုဖိုင်အချက်အလက်"</string>
     <string name="user_name_label" msgid="3210832645046206845">"အမည်"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"စနစ်ထည့်သွင်းထားခြင်း မရှိပါ"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"အသုံးပြုသူအမည် တည်းဖြတ်ခြင်း"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"အသုံးပြုသူနှင့် အကောင့်"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"အသုံးပြုသူ"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> အတွက် အကောင့်များ"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ထပ်လုပ်ရန်"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"ကျော်ရန်"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"မျက်နှာပြင်လော့ခ်တစ်ခု သတ်မှတ်ခြင်း"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"သင့်လော့ခ်ဖွင့်ပုံစံ ရွေးပါ"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"လက်ရှိ မျက်နှာပြင်လော့ခ်"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"လုံခြုံရေးအတွက် ပုံစံတစ်ခု သတ်မှတ်ပါ"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"ရှင်းရန်"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"မျက်နှာပြင်လော့ခ် ဖယ်လိုသလား။"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"၎င်းက မည်သူ့ကိုမဆို သင့်အကောင့်ထဲ ဝင်ခွင့်ပေးမည်"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"သင့်ပင်နံပါတ် ထည့်ပါ"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"သင့်စကားဝှက် ထည့်ပါ"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"လုံခြုံရေးအတွက် ပင်နံပါတ်တစ်ခု သတ်မှတ်ပါ"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"သင့်ပင်နံပါတ်ကို ပြန်ထည့်ပါ"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"ပင်နံပါတ်၌ အနည်းဆုံးဂဏန်း ၄ လုံး ပါရမည်"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"ပင်နံပါတ် မမှန်ကန်ပါ၊ အနည်းဆုံး ဂဏန်း ၄ လုံးပါရမည်။"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"ပင်နံပါတ်များ ထပ်တူမကျပါ"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"ပင်နံပါတ်ကို သိမ်းရာတွင် အမှားရှိနေသည်"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"ပင်နံပါတ် မှားနေသည်"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"စကားဝှက် မှားနေသည်"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"လုံခြုံရေးအတွက် စကားဝှက်တစ်ခု သတ်မှတ်ပါ"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"သင့်စကားဝှက်ကို ပြန်ထည့်ပါ"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"စကားဝှက်များ ထပ်တူမကျပါ"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"မလုပ်တော့"</string>
     <string name="backspace_key" msgid="1545590866688979099">"ပြန်ဖျက် ခလုတ်"</string>
     <string name="enter_key" msgid="2121394305541579468">"အတည်ပြု ခလုတ်"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"သရုပ်ပြမှ ထွက်မလား။"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"သရုပ်ပြအကောင့်ကို ဖျက်၍ သရုပ်ပြမုဒ်မှ ထွက်ခြင်းအတွက် စက်ရုံထုတ်အတိုင်း ပြင်ဆင်သတ်မှတ်ခြင်း လိုပါမည်။"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"သရုပ်ပြမှ ထွက်ရန်"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"သရုပ်ပြမုဒ်မှ ထွက်ရန်"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"၎င်းက သရုပ်ပြအကောင့်ကို ဖျက်ပြီး စနစ်ကို စက်ရုံထုတ်အခြေအနေပြန်ယူပါမည်။ အသုံးပြုသူ ဒေတာအားလုံး ရှိတော့မည်မဟုတ်ပါ။"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"သရုပ်ပြမှ ထွက်ရန်"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"စနစ်ထည့်သွင်းမှု အပြီးသတ်ရန်"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ယခုမလုပ်ပါ"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ကားမောင်းနေစဉ် လုပ်ဆောင်ချက်များ မရနိုင်ပါ။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6c55712..9f525fd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gjest"</string>
     <string name="user_switch" msgid="6544839750534690781">"Bytt"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Deg (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profilinformasjon"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Navn"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Ikke konfigurert"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Endre brukernavnet"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Brukere og kontoer"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Bruker"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Kontoer for <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Prøv på nytt"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Hopp over"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Angi en skjermlås"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Velg mønster"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Gjeldende skjermlås"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Angi et mønster for sikkerheten"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Fjern"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Vil du fjerne skjermlåsen?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Dette gir hvem som helst tilgang til kontoen din"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Skriv inn PIN-koden din"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Skriv inn passordet ditt"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Angi en PIN-kode for sikkerheten"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Angi PIN-koden på nytt"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-koden må bestå av minst fire sifre"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN-koden er ugyldig. Den må bestå av minst fire sifre."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-kodene samsvarer ikke"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Feil ved lagring av PIN-kode"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Feil PIN-kode"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Feil passord"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Angi et passord for sikkerheten"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Angi passordet på nytt"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Passordene samsvarer ikke"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Avbryt"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tilbake-tasten"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter-tasten"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Vil du avslutte demoen?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Du må tilbakestille til fabrikkstandard for å slette demokontoen og avslutte demomodus"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Avslutt demomodus"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Avslutt demomodus"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Dette sletter demokontoen og tilbakestiller systemet til fabrikkstandard. Alle brukerdataene går tapt."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Avslutt demomodus"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"fullfør konfigureringen"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ikke nå"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Handlingen er ikke tilgjengelig når du kjører."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 46ded0b..925952b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -115,7 +115,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> अतिरिक्त अनुमति</item>
     </plurals>
     <string name="system_setting_title" msgid="6864599341809463440">"प्रणाली"</string>
-    <string name="system_update_settings_list_item_title" msgid="5182439376921868735">"प्रणाली सम्बन्धी अद्यावधिकहरू"</string>
+    <string name="system_update_settings_list_item_title" msgid="5182439376921868735">"प्रणालीसम्बन्धी अद्यावधिकहरू"</string>
     <string name="system_update_settings_list_item_summary" msgid="7395202602021608371"></string>
     <string name="firmware_version" msgid="8491753744549309333">"Android संस्करण"</string>
     <string name="security_patch" msgid="4794276590178386903">"Android सुरक्षा प्याचको चरण"</string>
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"अतिथि"</string>
     <string name="user_switch" msgid="6544839750534690781">"बदल्नुहोस्‌"</string>
     <string name="current_user_name" msgid="3813671533249316823">"तपाईं (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"प्रोफाइलसम्बन्धी जानकारी"</string>
     <string name="user_name_label" msgid="3210832645046206845">"नाम"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"सेटअप गरिएको छैन"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"प्रयोगकर्ता र खाताहरू"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"प्रयोगकर्ता"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> को खाता"</string>
@@ -207,6 +208,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"पुनः प्रयास गर्ने"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"छाड्नुहोस्"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"स्क्रिन लक सेट गर्नुहोस्"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"आफ्नो ढाँचा छनौट गर्नुहोस्"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"हालको स्क्रिन लक"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"सुरक्षाका लागि ढाँचा सेट गर्नुहोस्"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"खाली गर्नुहोस्"</string>
@@ -223,12 +225,16 @@
     <string name="okay" msgid="4589873324439764349">"ठिक छ"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"स्क्रिन लक हटाउने हो?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"यस कार्यले जुनसुकै व्यक्तिलाई तपाईंको खातामाथि पहुँच राख्न दिने छ"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"आफ्नो PIN प्रविष्ट गर्नुहोस्"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"आफ्नो पासवर्ड प्रविष्ट गर्नुहोस्"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"सुरक्षाका ला‍गि एउटा PIN सेट गर्नुहोस्"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"आफ्नो PIN पुन: प्रविष्ट गर्नुहोस्"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN कम्तीमा ४ अङ्कको हुनै पर्ने"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pin अमान्य छ, यसमा अनिवार्य रूपमा कम्तीमा ४ अङ्क हुनु पर्छ।"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN हरू मेल खाँदैनन्"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN सुरक्षित गर्ने क्रममा त्रुटि भयो"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"गलत PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"गलत पासवर्ड"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"सुरक्षाका लागि पासवर्ड सेट गर्नुहोस्"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"आफ्नो पासवर्ड पुन: प्रविष्ट गर्नुहोस्"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"पासवर्डहरू मेल खाँदैनन्"</string>
@@ -280,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"रद्द गर्नुहोस्"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace कुञ्जी"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter कुञ्जी"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"डेमो मोडबाट बाहिरिने हो?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"डेमो खाता मेट्न र डेमो मोडबाट बाहिर निस्कन फ्याक्ट्री रिसेट गर्नु पर्ने हुन्छ"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"डेमो मोडबाट बाहिरिनुहोस्"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"डेमो मोडबाट बाहिरिनुहोस्"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"यस कार्यले डेमो खाता मेटाउनुका साथै प्रणालीमा फ्याक्ट्रीको डेटा रिसेट गर्दछ। प्रयोगकर्ताका सबै डेटा गुम्ने छन्।"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"डेमो मोडबाट बाहिरिनुहोस्"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"सेटअप सम्पन्न गर्नुहोस्"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"अहिले होइन"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"सवारी साधन चलाइरहेको बेला कारबाही उपलब्ध छैन।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f5ce12c..895245a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gast"</string>
     <string name="user_switch" msgid="6544839750534690781">"Wijzigen"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Jij (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profielinfo"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Naam"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Niet ingesteld"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Gebruikersnaam bewerken"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Gebruikers en accounts"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Gebruiker"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Accounts voor <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Opnieuw proberen"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Overslaan"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Een schermvergrendeling instellen"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Je patroon kiezen"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Huidige schermvergrendeling"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Stel wachtwoord in voor beveiliging"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Wissen"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Schermvergrendeling verwijderen?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Zo kan iedereen toegang tot je account krijgen"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Je pincode opgeven"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Geef je wachtwoord op"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Stel pincode in voor betere beveiliging"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Geef je pincode opnieuw op"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Pincode moet minimaal 4 tekens bevatten"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pincode ongeldig: moet uit minimaal vier tekens bestaan."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Pincodes komen niet overeen"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Fout bij pincode opslaan"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Onjuiste pincode"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Onjuist wachtwoord"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Stel wachtwoord in voor beveiliging"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Geef je wachtwoord opnieuw op"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Wachtwoorden niet gelijk"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Annuleren"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace-toets"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter-toets"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Demo afsluiten?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"De fabrieksinstellingen worden teruggezet als je het demo-account verwijdert en de demomodus sluit."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Demo afsluiten"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Demomodus afsluiten"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Hiermee wordt het demo-account verwijderd en wordt het systeem teruggezet op de fabrieksinstellingen. Alle gebruikersgegevens gaan verloren."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demo afsluiten"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"instellen voltooien"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"niet nu"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Actie niet beschikbaar tijdens het rijden."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 1223f0a..1e63849 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -309,12 +309,12 @@
     <skip />
     <!-- no translation found for current_user_name (3813671533249316823) -->
     <skip />
-    <!-- no translation found for user_settings_details_title (3016069827765597036) -->
-    <skip />
     <!-- no translation found for user_name_label (3210832645046206845) -->
     <skip />
     <!-- no translation found for user_summary_not_set_up (1473688119241224145) -->
     <skip />
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <!-- no translation found for user_and_account_settings_title (1542965868877207832) -->
     <skip />
     <!-- no translation found for user_settings_title (5511846421187697406) -->
@@ -351,19 +351,16 @@
     <skip />
     <!-- no translation found for security_settings_subtitle (2244635550239273229) -->
     <skip />
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"କିଛି ନାହିଁ"</string>
     <!-- no translation found for security_lock_pattern (1174352995619563104) -->
     <skip />
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"PIN"</string>
     <!-- no translation found for security_lock_password (4420203740048322494) -->
     <skip />
     <!-- no translation found for lock_settings_picker_title (6590330165050361632) -->
     <skip />
     <string name="screen_lock_options" msgid="7023338635352915768">"ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"ଆପଣଙ୍କର ପାଟର୍ନ ଆଙ୍କନ୍ତୁ"</string>
     <!-- no translation found for lockpattern_confirm_button_text (7784925958324484965) -->
     <skip />
     <!-- no translation found for lockpattern_restart_button_text (9355771277617537) -->
@@ -375,8 +372,8 @@
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"ଛାଡ଼ିଦିଅନ୍ତୁ"</string>
     <!-- no translation found for set_screen_lock (5239317292691332780) -->
     <skip />
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"ନିଜ ପାର୍ଟନ୍‌ ବାଛନ୍ତୁ"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"ବର୍ତ୍ତମାନର ସ୍କ୍ରୀନ୍‌ ଲକ୍‌"</string>
     <!-- no translation found for choose_lock_pattern_message (6242765203541309524) -->
     <skip />
     <!-- no translation found for lockpattern_retry_button_text (4655398824001857843) -->
@@ -403,10 +400,10 @@
     <skip />
     <!-- no translation found for okay (4589873324439764349) -->
     <skip />
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
-    <skip />
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"ସ୍କ୍ରୀନ ଲକ୍ ରିମୁଭ୍‍ କରିବେ କି?"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"ଏହା ଯେକୌଣସି ବ୍ୟକ୍ତି ଆପଣଙ୍କ ଆକାଉଣ୍ଟରେ ପ୍ରବେଶ ପାଇଁ ଅନୁମତି ଦେବ"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"ନିଜର PIN ଲେଖନ୍ତୁ"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"ନିଜ ପାସ୍‌ୱର୍ଡ ଲେଖନ୍ତୁ"</string>
     <!-- no translation found for choose_lock_pin_message (2963792070267774417) -->
     <skip />
     <!-- no translation found for confirm_your_pin_header (9096581288537156102) -->
@@ -418,6 +415,8 @@
     <skip />
     <!-- no translation found for error_saving_lockpin (9011960139736000393) -->
     <skip />
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"ଭୁଲ PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"ଭୁଲ ପାସ୍‌ୱର୍ଡ"</string>
     <!-- no translation found for choose_lock_password_message (6124341145027370784) -->
     <skip />
     <!-- no translation found for confirm_your_password_header (7052891840366724938) -->
@@ -472,8 +471,10 @@
     <skip />
     <string name="backspace_key" msgid="1545590866688979099">"Backspace କୀ"</string>
     <string name="enter_key" msgid="2121394305541579468">"କୀ ଦବାନ୍ତୁ"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ଡେମୋ ମୋଡ୍‌ରୁ ବାହାରିଆସିବେ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ଡେମୋ ଆକାଉଣ୍ଟ ଡିଲିଟ୍ କରିବାକୁ ଏବଂ ଡେମୋ ମୋଡ୍‌ରୁ ବାହାରି ଆସିବାକୁ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍ କରିବା ଆବଶ୍ୟକ"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ଡେମୋରୁ ବାହାରିଯା’ନ୍ତୁ"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ଡେମୋ ମୋଡ୍‌ରୁ ବାହାରିଯା’ନ୍ତୁ"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ଏହା ଡେମୋ ଆକାଉଣ୍ଟକୁ ଡିଲିଟ୍ କରିଦେବ ଏବଂ ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ସିଷ୍ଟମ୍‍କୁ ରିସେଟ୍ କରିବ। ସମସ୍ତ ୟୁଜର୍ ଡାଟା ନଷ୍ଟ ହୋ‍ଇଯିବ।"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ଡେମୋରୁ ବାହାରିଯା’ନ୍ତୁ"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ସେଟ୍-ଅପ୍ ସମାପ୍ତ କରନ୍ତୁ"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ଏବେ ନୁହେଁଁ"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ଗାଡ଼ି ଚଲାଇବାବେଳେ ଏହି କାର୍ଯ୍ୟ କରିହେବ ନାହିଁ।"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 2fe202b..57b09a4 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"ਮਹਿਮਾਨ"</string>
     <string name="user_switch" msgid="6544839750534690781">"ਅਦਲਾ-ਬਦਲੀ ਕਰੋ"</string>
     <string name="current_user_name" msgid="3813671533249316823">"ਤੁਸੀਂ (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ"</string>
     <string name="user_name_label" msgid="3210832645046206845">"ਨਾਮ"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"ਸੈੱਟਅੱਪ ਨਹੀਂ ਕੀਤਾ ਹੈ"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ਵਰਤੋਂਕਾਰ ਅਤੇ ਖਾਤੇ"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ਵਰਤੋਂਕਾਰ"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> ਦੇ ਖਾਤੇ"</string>
@@ -194,24 +195,21 @@
     <string name="user_add_user_message_update" msgid="1528170913388932459">"ਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="security_settings_title" msgid="6955331714774709746">"ਸੁਰੱਖਿਆ"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="security_lock_pattern" msgid="1174352995619563104">"ਪੈਟਰਨ"</string>
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"ਪਿੰਨ"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"ਪਾਸਵਰਡ"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"ਕੋਈ ਲਾਕ ਕਿਸਮ ਚੁਣੋ"</string>
     <string name="screen_lock_options" msgid="7023338635352915768">"ਸਕ੍ਰੀਨ ਲਾਕ ਦੇ ਵਿਕਲਪ"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"ਮੁੜ-ਉਲੀਕੋ"</string>
     <string name="continue_button_text" msgid="5129979170426836641">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"ਛੱਡੋ"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"ਕੋਈ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"ਆਪਣਾ ਪੈਟਰਨ ਚੁਣੋ"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ ਲਾਕ"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="lockpattern_cancel_button_text" msgid="4068764595622381766">"ਰੱਦ ਕਰੋ"</string>
@@ -225,16 +223,18 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"ਇੱਕ ਅਣਲਾਕ ਪੈਟਰਨ ਕਿਵੇਂ ਉਲੀਕੀਏ"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"ਪੈਟਰਨ ਰੱਖਿਅਤ ਕਰਨ ਵੇਲੇ ਗੜਬੜ ਹੋਈ"</string>
     <string name="okay" msgid="4589873324439764349">"ਠੀਕ ਹੈ"</string>
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
-    <skip />
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"ਕੀ ਸਕ੍ਰੀਨ ਲਾਕ ਹਟਾਉਣਾ ਹੈ?"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"ਇਹ ਕਿਸੇ ਨੂੰ ਤੁਹਾਡੇ ਖਾਤੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਵੇਗਾ"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"ਆਪਣਾ ਪਿੰਨ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"ਪਿੰਨ ਘੱਟੋ-ਘੱਟ 4 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"ਪਿੰਨ ਅਵੈਧ ਹੈ, ਘੱਟੋ-ਘੱਟ 4 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"ਪਿੰਨ ਰੱਖਿਅਤ ਕਰਨ ਵੇਲੇ ਗੜਬੜ ਹੋਈ"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"ਗਲਤ ਪਿੰਨ"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"ਗਲਤ ਪਾਸਵਰਡ"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"ਆਪਣਾ ਪਾਸਵਰਡ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
@@ -286,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"ਰੱਦ ਕਰੋ"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace ਕੁੰਜੀ"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter ਕੁੰਜੀ"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ਕੀ ਡੈਮੋ ਤੋਂ ਬਾਹਰ ਜਾਣਾ?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ਡੈਮੋ ਖਾਤੇ ਨੂੰ ਮਿਟਾਉਣ ਅਤੇ ਡੈਮੋ ਮੋਡ ਤੋਂ ਬਾਹਰ ਜਾਣ ਲਈ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ਡੈਮੋ ਮੋਡ ਤੋ ਬਾਹਰ ਜਾਓ"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ਡੈਮੋ ਮੋਡ ਤੋ ਬਾਹਰ ਜਾਓ"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ਇਹ ਡੈਮੋ ਖਾਤੇ ਨੂੰ ਮਿਟਾ ਦੇਵੇਗਾ ਅਤੇ ਸਿਸਟਮ ਦਾ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਹੋ ਜਾਵੇਗਾ। ਸਾਰਾ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਗੁੰਮ ਹੋ ਜਾਵੇਗਾ।"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ਡੈਮੋ ਮੋਡ ਤੋ ਬਾਹਰ ਜਾਓ"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰੋ"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ਹੁਣੇ ਨਹੀਂ"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ ਕਾਰਵਾਈ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 858702f..65be5e8 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gość"</string>
     <string name="user_switch" msgid="6544839750534690781">"Przełącz"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Ty (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informacje o profilu"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nazwa"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nieskonfigurowany"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Edytowanie nazwy użytkownika"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Użytkownicy i konta"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Użytkownik"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Konta użytkownika <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Ponów"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Pomiń"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ustawianie blokady ekranu"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Wybierz wzór"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Aktualna blokada ekranu"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Ze względów bezpieczeństwa ustaw wzór"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Wyczyść"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Usunąć blokadę ekranu?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Każdy będzie mógł mieć dostęp do Twojego konta"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Wpisz kod PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Wpisz hasło"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Ze względów bezpieczeństwa ustaw kod PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Podaj ponownie kod PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Kod PIN musi mieć co najmniej 4 cyfry"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Kod PIN musi mieć co najmniej 4 cyfry."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Kody PIN nie są identyczne"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Błąd podczas zapisywania kodu PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Nieprawidłowy kod PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Nieprawidłowe hasło"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Ze względów bezpieczeństwa ustaw hasło"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Podaj ponownie hasło"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Hasła nie są identyczne"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"Anuluj"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Klawisz Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Klawisz Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Zamknąć tryb demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Usunięcie konta demonstracyjnego i wyłączenie trybu demo wymaga przywrócenia ustawień fabrycznych"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Zamknij tryb demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Zamknij tryb demonstracyjny"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Spowoduje to usunięcie konta demonstracyjnego i przywrócenie danych fabrycznych systemu. Utracisz wszystkie swoje dane użytkownika."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Zamknij tryb demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"dokończ konfigurację"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"nie teraz"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Czynność niedostępna podczas jazdy."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c75aa6f..b10373a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Convidado"</string>
     <string name="user_switch" msgid="6544839750534690781">"Mudar"</string>
     <string name="current_user_name" msgid="3813671533249316823">"O utilizador (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informação do perfil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nome"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Não configurado"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Editar o nome do utilizador"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Utilizadores e contas"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Utilizador"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Contas de <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Tentar novamente"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Ignorar"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Definir um bloqueio de ecrã"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Escolher o padrão"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Bloqueio de ecrã atual"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Por segurança, defina um padrão."</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Limpar"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Remover o bloqueio de ecrã?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Desta forma, qualquer pessoa pode aceder à sua conta."</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Introduzir o PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Introduza a palavra-passe"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Por motivos de segurança, defina um PIN."</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Reintroduzir o PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"O PIN deve ter, pelo menos, 4 dígitos."</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN inválido. Tem de ter, pelo menos, 4 dígitos."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Os PINs não coincidem"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Erro ao guardar o PIN."</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN incorreto"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Palavra-passe incorreta."</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Por segurança, defina uma palavra-passe."</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Reintroduzir a palavra-passe"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Palavras-passe não coincidem"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancelar"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tecla de retrocesso"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tecla Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Sair da demonstração?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Eliminar a conta de demonstração e sair do modo de demonstração requer uma reposição de fábrica."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Sair da demonstração"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Sair do modo de demonstração"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Esta ação elimina a conta de demonstração e efetua a reposição de dados de fábrica do sistema. Todos os dados do utilizador são perdidos."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Sair da demonstração"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"concluir configuração"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"agora não"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Ação não disponível durante a condução."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 190b1c2..cb939e8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Convidado"</string>
     <string name="user_switch" msgid="6544839750534690781">"Alternar"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Você (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informação do perfil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nome"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Não configurado"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Editar nome de usuário"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Usuários e contas"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Usuário"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Contas de <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Repetir"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Pular"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Definir bloqueio de tela"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Escolha seu padrão"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Bloqueio de tela atual"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Por segurança, defina um padrão"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Limpar"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Ok"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Remover bloqueio de tela?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Qualquer pessoa poderá acessar sua conta"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Digite seu PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Digite sua senha"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Por segurança, defina um PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Digite seu PIN novamente"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"O PIN deve ter no mínimo quatro dígitos"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN inválido. Ele precisa ter pelo menos quatro dígitos."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Os PINs não correspondem"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Erro ao salvar o PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN incorreto"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Senha incorreta"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Por segurança, defina uma senha"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Digite sua senha novamente"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"As senhas não correspondem"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Cancelar"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tecla Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tecla Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Sair da demonstração?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Para excluir a conta e sair do modo de demonstração é necessário restaurar a configuração original"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Sair da demonstração"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Sair do modo de demonstração"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Isso excluirá a conta de demonstração e redefinirá o sistema para a configuração original. Todos os dados do usuário serão perdidos."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Sair da demonstração"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"concluir configuração"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"agora não"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Ação não disponível enquanto você dirige"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 76d835c..ee3f27e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -174,9 +174,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Invitat"</string>
     <string name="user_switch" msgid="6544839750534690781">"Comutați"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Dvs. (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informații de profil"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nume"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Neconfigurat"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Editați numele de utilizator"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Utilizatori și conturi"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Utilizator"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Conturi pentru <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -208,6 +208,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Reîncercați"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Omiteți"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Setați o blocare a ecranului"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Alegeți modelul"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Blocarea actuală a ecranului"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Pentru securitate, setați un model"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Ștergeți"</string>
@@ -224,12 +225,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Eliminați blocarea ecranului?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Acțiunea va permite oricui să vă acceseze contul"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Introduceți codul PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Introduceți parola"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Pentru securitate, setați un cod PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Reintroduceți codul PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Codul PIN necesită minimum 4 cifre"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Cod PIN nevalid; trebuie să aibă minimum 4 cifre."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Codurile PIN nu corespund"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Eroare la salvarea codului PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Cod PIN greșit"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Parolă greșită"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Pentru securitate, setați o parolă"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Reintroduceți parola"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Parolele nu corespund"</string>
@@ -287,8 +292,10 @@
     <string name="cancel" msgid="750286395700355455">"Anulați"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tasta Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tasta Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Închideți demonstrația?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Pentru a șterge contul demonstrativ și a ieși din acest mod, restabiliți setările din fabrică"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Închideți demonstrația"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Închideți modul demonstrativ"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Această acțiune va șterge contul demonstrativ, iar sistemul va reveni la setările din fabrică. Toate datele utilizatorului se vor pierde."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Închideți demonstrația"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"finalizați configurarea"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"nu acum"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Acțiunea nu este disponibilă când conduceți."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e0e280f..51c5654 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Гость"</string>
     <string name="user_switch" msgid="6544839750534690781">"Сменить пользователя"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Вы (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Информация профиля"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Имя"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Не настроен"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Изменение имени пользователя"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Пользователи и аккаунты"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Пользователь"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Аккаунты пользователя <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Повторить попытку"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Пропустить"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Блокировка экрана"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Выберите графический ключ"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Текущий способ блокировки"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Для защиты системы создайте граф. ключ."</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Очистить"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"ОК"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Отключить блокировку экрана?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Доступ к вашему аккаунту сможет получить кто угодно."</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Введите PIN-код"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Введите пароль"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Для защиты системы создайте PIN-код."</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Введите PIN-код ещё раз"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-код должен быть не короче 4 цифр."</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Ошибка. PIN-код должен содержать не менее 4 цифр."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-коды не совпадают"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Не удалось сохранить PIN-код"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Неверный PIN-код."</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Неверный пароль."</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Для защиты системы создайте пароль."</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Введите пароль ещё раз"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Пароли не совпадают"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"Отмена"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Клавиша Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Клавиша Ввод"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Выйти из деморежима?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Чтобы удалить тестовый аккаунт и выйти из деморежима, потребуется сбросить настройки."</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Выйти из деморежима"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Выход из деморежима"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Произойдет сброс настроек. Тестовый аккаунт и все пользовательские данные будут удалены."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Выйти из деморежима"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"Завершить настройку"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"Не сейчас"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Это действие недоступно во время вождения."</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 5517efe..aa06316 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"අමුත්තා"</string>
     <string name="user_switch" msgid="6544839750534690781">"මාරු වෙන්න"</string>
     <string name="current_user_name" msgid="3813671533249316823">"ඔබ (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"පැතිකඩ තතු"</string>
     <string name="user_name_label" msgid="3210832645046206845">"නම‍"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"සකසා නැත"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"පරිශීලක නම සංස්කරණය"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"පරිශීලකයින් සහ ගිණුම්"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"පරිශීලක"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> සඳහා ගිණුම්"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"යළි උත්සාහ කරන්න"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"මඟ හරින්න"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"තිර අගුලක් සකසන්න"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"ඔබේ රටාව තෝරා ගන්න"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"වත්මන් තිර අගුල"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"ආරක්ෂාව සඳහා, රටාවක් සකසන්න"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"හිස් කරන්න"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"හරි"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"තිර අගුල ඉවත් කරන්නද?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"මෙය ඔබගේ ගිණුමට පිවිසීමට ඕනෑම අයෙකුට ඉඩ දෙනු ඇත"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"ඔබේ PIN ඇතුළු කරන්න"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"ඔබේ මුරපදය ඇතුළු කරන්න"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"ආරක්ෂාව සඳහා, PIN එකක් සකසන්න"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"ඔබේ PIN අංකය නැවත ඇතුළු කරන්න"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN අඩු තරමින් සංඛ්‍යා 4ක් විය යුතුය"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pin අවලංගුයි, අවම වශයෙන් ඉලක්කම් 4ක් විය යුතුය."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN අංක නොගැළපේ"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN අංකය සුරැකීමේ දෝෂයකි"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN එක වැරදියි"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"වැරදි මුරපදයකි"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"ආරක්ෂාව සඳහා, මුරපදයක් සකසන්න"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"ඔබේ මුරපදය නැවතත් ඇතුළු කරන්න"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"මුරපද නොගැළපේ"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"අවලංගු කරන්න"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace යතුර"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter යතුර"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ආදර්ශනයෙන් ඉවත් වන්නද?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ආදර්ශන ගිණුම මකා දමා ආදර්ශන ආකාරයෙන් ඉවත් වීම සඳහා කර්මාන්තශාලා යළි පිහිටුවීම කළ යුතු වේ"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ආදර්ශනයෙන් ඉවත් වන්න"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ආදර්ශන ප්‍රකාරයෙන් ඉවත් වන්න"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"මෙමගින් ආදර්ශන ගිණුම මකා පද්ධතිය කර්මාන්තශාලා දත්ත යළි පිහිටුවීම කරනු ඇත. සියලු පරිශීලක දත්ත අහිමි වනු ඇත."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ආදර්ශනයෙන් ඉවත් වන්න"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"පිහිටුවීම අවසන් කරන්න"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"දැන් නොවේ"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"රිය පැදවීමේ දී ක්‍රියාව නොතිබේ."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8faf796..011a182 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Hosť"</string>
     <string name="user_switch" msgid="6544839750534690781">"Prepnúť"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Vy (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informácie o profile"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Meno"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nenastavené"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Úprava používateľského mena"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Používatelia a účty"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Používateľ"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Účty používateľa <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Skúsiť znovu"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Preskočiť"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Nastavte zámku obrazovky"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Vyberte vzor"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Aktuálna zámka obrazovky"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Z bezpečnostných dôvodov nastavte vzor"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Vymazať"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Odstrániť zámku obrazovky?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Ktokoľvek bude mať prístup do vášho účtu"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Zadajte PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Zadajte svoje heslo"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Z bezpečnostných dôvodov nastavte PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Znova zadajte kód PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN musí mať aspoň 4 číslice"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Kód PIN je neplatný, musí mať najmenej 4 číslice."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Kódy PIN sa nezhodujú"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Pri ukladaní kódu PIN sa vyskytla chyba"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Nesprávny PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Nesprávne heslo"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Z bezpečnostných dôvodov nastavte heslo"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Znova zadajte heslo"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Heslá sa nezhodujú"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"Zrušiť"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Kláves Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Kláves Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Ukončiť ukážku?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Odstránenie ukážkového účtu a ukončenie ukážkového režimu vyžaduje obnovenie výrobných nastavení"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Ukončiť ukážku"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Ukončenie ukážkového režimu"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ukážkový účet bude odstránený a systém sa obnoví do výrobných nastavení. Všetky dáta používateľa budú stratené."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Ukončiť ukážku"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"dokončiť nastavenie"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"teraz nie"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Akcia nie je k dispozícii za jazdy."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f64b6f8..19ae27a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gost"</string>
     <string name="user_switch" msgid="6544839750534690781">"Preklop"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Vi (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Podatki o profilu"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Ime"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Uporabnik ni nastavljen"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Urejanje imena uporabnika"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Uporabniki in računi"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Uporabnik"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Računi uporabnika <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Znova"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Preskoči"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Nastavite zaklepanje zaslona"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Izberite vzorec"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Trenutno zaklepanje zaslona"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Nastavite vzorec za večjo varnost"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Počisti"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"V redu"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Želite odstr. zaklep. zaslona?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"S tem bo lahko vsak dostopal do računa"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Vnesite kodo PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Vnesite geslo"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Zaradi varnosti nastavite kodo PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Znova vnesite kodo PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Koda PIN mora biti najmanj 4-mestna"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Koda PIN je neveljavna. Vsebovati mora najmanj 4 števke."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Kodi PIN se ne ujemata"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Napaka pri shranjevanju kode PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Napačna koda PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Napačno geslo"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Zaradi varnosti nastavite geslo"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Znova vnesite geslo"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Gesli se ne ujemata"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"Prekliči"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Vračalka"</string>
     <string name="enter_key" msgid="2121394305541579468">"Tipka Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Želite zapreti predstav.?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Izbris predstav. računa in zapiranje predstav. načina terjata ponastavitev na tovarniške nastavitve"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Zapri predstavitev"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Zapri predstavitveni način"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"S tem izbrišete predstavitveni račun in ponastavite sistem na tovarniške nastavitve. Vsi uporabniški podatki bodo izgubljeni."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Zapri predstavitev"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"dokončaj nastavitev"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ne zdaj"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Dejanje med vožnjo ni na voljo."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index c3337fa..d7638c4 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"I ftuar"</string>
     <string name="user_switch" msgid="6544839750534690781">"Ndërro"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Ti (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Informacioni i profilit"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Emri"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Nuk është konfiguruar"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Redakto emrin e përdoruesit"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Përdoruesit dhe llogaritë"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Përdoruesi"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Llogaritë për <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Riprovo"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Kapërce"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Cakto një kyçje të ekranit"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Zgjidh motivin"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Kyçja aktuale e ekranit"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Për siguri, cakto një motiv"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Pastro"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Në rregull"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Të hiqet kyçja e ekranit?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Kjo do të lejojë këdo që të ketë qasje në llogarinë tënde"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Fut kodin PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Fut fjalëkalimin"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Për siguri, cakto një kod PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Fut përsëri kodin PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Kodi PIN duhet të jetë të paktën 4 shifra"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Kodi PIN është i pavlefshëm, duhet të jetë të paktën 4 shifra."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Kodet PIN nuk përputhen"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Gabim gjatë ruajtjes së kodit PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Kod PIN i gabuar"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Fjalëkalim i gabuar"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Për siguri, cakto një fjalëkalim"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Fut përsëri fjalëkalimin"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Fjalëkalimet nuk përputhen"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Anulo"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Tasti \"Kthim prapa\""</string>
     <string name="enter_key" msgid="2121394305541579468">"Tasti \"Hyrje\""</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Do të dalësh nga demonstrimi?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Fshirja e llogarisë së demonstrimit dhe dalja nga modaliteti i demonstrimit do të kërkojë rivendosje në gjendje fabrike"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Dil nga demonstrimi"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Dil nga modaliteti i demonstrimit"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Kjo do të fshijë llogarinë e demonstrimit dhe sistemi do të rivendoset në të dhënat e fabrikës. Të gjitha të dhënat e përdoruesit do të humbasin."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Dil nga demonstrimi"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"përfundo konfigurimin"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"jo tani"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Veprimi nuk ofrohet gjatë drejtimit të makinës"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 04899da..24c3884 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -174,9 +174,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Гост"</string>
     <string name="user_switch" msgid="6544839750534690781">"Пребаците на другог корисника"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Ви (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Подаци о профилу"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Име"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Није подешено"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Измените име корисника"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Корисници и налози"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Корисник"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Налози за корисника <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -208,6 +208,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Пробај поново"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Прескочи"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Подесите закључавање екрана"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Одаберите шаблон"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Тренутно закључавање екрана"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Подесите шаблон из безбедносних разлога"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Обриши"</string>
@@ -224,12 +225,16 @@
     <string name="okay" msgid="4589873324439764349">"Потврди"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Желите ли да укл. зак. екрана?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Овим ћете дозволити свима приступ вашем налогу"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Унесите PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Унесите лозинку"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Подесите PIN из безбедносних разлога"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Поново унесите PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN мора да садржи најмање 4 цифре"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN је неважећи, мора да садржи најмање 4 цифре."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-ови се не подударају"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Грешка при чувању PIN-а"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Погрешан PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Погрешна лозинка"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Подесите лозинку из безбедносних разлога"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Поново унесите лозинку"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Лозинке се не подударају"</string>
@@ -287,8 +292,10 @@
     <string name="cancel" msgid="750286395700355455">"Откажи"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Тастер за брисање уназад"</string>
     <string name="enter_key" msgid="2121394305541579468">"Тастер Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Нап. реж. демонстрације?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"За брисање налога за дем. и излазак из режима демо. је потребно ресетовање на фабричка подешавања"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Напустите режим демонстр."</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Да напустите режим дем.?"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Овим ћете избрисати налог за демонстрације и ресетовати систем на фабричка подешавања. Сви подаци корисника ће бити изгубљени."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Напусти режим демонстр."</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"завршите подешавање"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"не сада"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Радња није доступна током вожње."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ca34c66..08af35c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Gäst"</string>
     <string name="user_switch" msgid="6544839750534690781">"Byt"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Du (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profilinfo"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Namn"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Inte konfigurerad"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Redigera användarnamn"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Användare och konton"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Användare"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Konton som tillhör <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Försök igen"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Hoppa över"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ange ett skärmlås"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Välj grafiskt lösenord"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Nuvarande skärmlås"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Ange ett grafiskt lösenord som skydd"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Rensa"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Vill du ta bort skärmlåset?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Om du tar bort skärmlåset kan alla få åtkomst till kontot"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Ange pinkoden"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Ange ditt lösenord"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Av säkerhetsskäl måste du ange en pinkod"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Ange din pinkod igen"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Pinkoden måste innehålla minst 4 siffror"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Pinkoden är ogiltig. Den måste innehålla minst 4 siffror."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Pinkoderna matchar inte"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Pinkod kunde inte sparas"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Fel pinkod"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Fel lösenord"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Ange ett lösenord som skydd"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Ange ditt lösenord igen"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Lösenorden matchar inte"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Avbryt"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backstegstangent"</string>
     <string name="enter_key" msgid="2121394305541579468">"Returtangent"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Avsluta demoläget?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Du måste återställa standardinställningarna om du vill radera demokontot och avsluta demoläget"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Avsluta demoläget"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Avsluta demoläge"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Detta raderar demokontot och återställer standardinställningarna för systemet. All användardata tas bort."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Avsluta demoläget"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"slutför konfigurationen"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"inte nu"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Åtgärden är inte tillgänglig när du kör."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1ad8958..0742b05 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Mgeni"</string>
     <string name="user_switch" msgid="6544839750534690781">"Badilisha"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Wewe (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Maelezo ya wasifu"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Jina"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Haijawekwa mipangilio"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Badilisha jina la mtumiaji"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Akaunti na watumiaji"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Mtumiaji"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Akaunti za <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Jaribu tena"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Ruka"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Weka mbinu ya kufunga skrini"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Chagua mchoro wako"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Mbinu inayotumika kufunga skrini"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Kwa sababu za usalama, weka mchoro"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Futa"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Sawa"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Utaondoa mbinu ya kufunga skrini?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Hatua hii itamruhusu mtu yeyote afikie akaunti yako"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Weka PIN yako"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Weka nenosiri lako"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Kwa sababu za usalama, weka PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Weka PIN yako tena"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Lazima PIN iwe na angalau tarakimu 4"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN si sahihi, ni lazima iwe na angalau tarakimu 4."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN hazilingani"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Hitilafu ya kuhifadhi PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Nambari ya PIN si sahihi"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Nenosiri si sahihi"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Kwa sababu za usalama, weka nenosiri"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Weka nenosiri lako tena"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Manenosiri hayalingani"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Ghairi"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Kitufe cha Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Kitufe cha Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Unataka Kufunga Onyesho?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Utatakiwa urejeshe mipangilio ya kiwandani ili ufute akaunti ya onyesho na ufunge hali ya onyesho"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Funga Onyesho"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Funga hali ya onyesho"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Hatua hii itafuta akaunti ya onyesho na kurejesha data ambayo kifaa kilitoka nayo kiwandani. Data yote ya mtumiaji itapotea."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Funga Onyesho"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"maliza kuweka mipangilio"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"si sasa"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Huwezi kufanya kitendo hicho unapoendesha gari."</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index e032e61..0bafab3 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"விருந்தினர்"</string>
     <string name="user_switch" msgid="6544839750534690781">"பயனரை மாற்றும்"</string>
     <string name="current_user_name" msgid="3813671533249316823">"நீங்கள் (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"சுயவிவரத் தகவல்"</string>
     <string name="user_name_label" msgid="3210832645046206845">"பெயர்"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"அமைக்கவில்லை"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"பயனர் பெயரைத் திருத்தவும்"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"பயனர்கள் &amp; கணக்குகள்"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"பயனர்"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> இன் கணக்குகள்"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"மீண்டும் முயலவும்"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"தவிர்"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"திரைப் பூட்டை அமைக்கவும்"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"பேட்டர்னைத் தேர்வுசெய்யவும்"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"தற்போதைய திரைப் பூட்டு"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"பாதுகாப்பிற்கு, பேட்டர்னை அமைக்கவும்"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"அழி"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"சரி"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"திரைப் பூட்டை அகற்றவா?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"திரைப் பூட்டை அகற்றினால், அனைவருக்கும் அணுகல் கிடைக்கும்"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"பின்னை உள்ளிடவும்"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"கடவுச்சொல்லை உள்ளிடவும்"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"பாதுகாப்பிற்கு, பின்னை அமைக்கவும்"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"பின்னை மீண்டும் உள்ளிடவும்"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"குறைந்தது 4 இலக்கங்கள் இருக்க வேண்டும்"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"பின் தவறானது, குறைந்தது 4 இலக்கங்கள் இருக்க வேண்டும்."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"பின்கள் பொருந்தவில்லை"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"பின்னைச் சேமிப்பதில் பிழை"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"தவறான பின்"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"தவறான கடவுச்சொல்"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"பாதுகாப்பிற்கு, கடவுச்சொல்லை அமைக்கவும்"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"கடவுச்சொல்லை மீண்டும் உள்ளிடவும்"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"கடவுச்சொற்கள் பொருந்தவில்லை"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"ரத்துசெய்"</string>
     <string name="backspace_key" msgid="1545590866688979099">"பேக்ஸ்பேஸ் விசை"</string>
     <string name="enter_key" msgid="2121394305541579468">"என்டர் விசை"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"டெமோவிலிருந்து வெளியேறவா?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"டெமோ கணக்கை நீக்க மற்றும் டெமோ முறையிலிருந்து வெளியேற, ஆரம்பநிலை மீட்டமைவைச் செயல்படுத்த வேண்டும்"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"டெமோவிலிருந்து வெளியேறு"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"டெமோ மோடிலிருந்து வெளியேறுதல்"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"இவ்வாறு செய்தால், டெமோ கணக்கு நீக்கப்படுவதோடு, சாதனமானது தரவின் ஆரம்பநிலைக்கு மீட்டமைக்கப்படும். எல்லாப் பயனர் தரவையும் இழப்பீர்கள்."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"டெமோவிலிருந்து வெளியேறு"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"அமைவை முடி"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"இப்போது வேண்டாம்"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"வாகனம் ஓட்டும்போது, இந்தச் செயலைச் செய்ய முடியாது."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 07ac79e..3b7a76b 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"అతిథి"</string>
     <string name="user_switch" msgid="6544839750534690781">"మార్చు"</string>
     <string name="current_user_name" msgid="3813671533249316823">"మీరు (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"ప్రొఫైల్ సమాచారం"</string>
     <string name="user_name_label" msgid="3210832645046206845">"పేరు"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"సెటప్ చేయలేదు"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"వినియోగదారులు, ఖాతాలు"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"వినియోగదారు"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> యొక్క ఖాతాలు"</string>
@@ -194,24 +195,21 @@
     <string name="user_add_user_message_update" msgid="1528170913388932459">"ఏ వినియోగదారు అయినా మిగతా అందరు వినియోగదారుల కోసం యాప్‌లను అప్‌డేట్ చేయవచ్చు."</string>
     <string name="security_settings_title" msgid="6955331714774709746">"భద్రత"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"స్క్రీన్ లాక్"</string>
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"ఏదీ కాదు"</string>
     <string name="security_lock_pattern" msgid="1174352995619563104">"ఆకృతి"</string>
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"పిన్"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"పాస్‌‌వర్డ్"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"లాక్ రకాన్ని ఎంచుకోండి"</string>
     <string name="screen_lock_options" msgid="7023338635352915768">"స్క్రీన్ లాక్ ఎంపికలు"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"మీ ఆకృతిని నమోదు చేయండి"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"నిర్ధారించు"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"మళ్లీ గీయి"</string>
     <string name="continue_button_text" msgid="5129979170426836641">"కొనసాగించు"</string>
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"మళ్లీ ప్రయత్నించు"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"దాటవేయి"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"స్క్రీన్ లాక్‌ను సెట్ చేయండి"</string>
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"మీ నమూనాను ఎంచుకోండి"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"ప్రస్తుత స్క్రీన్ లాక్"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"భద్రత కోసం, ఆకృతిని సెట్ చేయండి"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"తీసివేయి"</string>
     <string name="lockpattern_cancel_button_text" msgid="4068764595622381766">"రద్దు చేయి"</string>
@@ -225,16 +223,18 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"అన్‌లాక్ నమూనాను ఎలా గీయాలి"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"ఆకృతిని సేవ్ చేయడంలో ఎర్రర్ ఏర్పడింది"</string>
     <string name="okay" msgid="4589873324439764349">"సరే"</string>
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
-    <skip />
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"స్క్రీన్ లాక్‌ను తీసివేయాలా?"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"ఎవరైనా మీ ఖాతాను యాక్సెస్ చేయడానికి ఇది అనుమతిస్తుంది"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"మీ పిన్‌ని నమోదు చేయండి"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"మీ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"భద్రత కోసం, పిన్‌ను సెట్ చేయండి"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"మీ పిన్‌ను మళ్లీ నమోదు చేయండి"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"పిన్ తప్పనిసరిగా కనీసం 4 అంకెలు ఉండాలి"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"పిన్ చెల్లదు, కనీసం 4 అంకెలు ఉండాలి."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"పిన్‌లు సరిపోలలేదు"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"పిన్‌ని సేవ్ చేయడంలో ఎర్రర్ ఏర్పడింది"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"పిన్ తప్పు"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"పాస్‌వర్డ్ తప్పు"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"భద్రత కోసం, పాస్‌వర్డ్‌ను సెట్ చేయండి"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"మీ పాస్‌వర్డ్‌ను మళ్లీ నమోదు చేయండి"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"పాస్‌‌వర్డ్‌లు సరిపోలలేదు"</string>
@@ -286,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"రద్దు చేయి"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace కీ"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter కీ"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"డెమో నుండి నిష్క్రమించాలా?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"డెమో ఖాతాను తొలగించడం మరియు డెమో మోడ్ నుండి నిష్క్రమించడం వంటి వాటికి ఫ్యాక్టరీ రీసెట్ అవసరం"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"డెమో నుండి నిష్క్రమించండి"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"డెమో మోడ్ నుండి నిష్క్రమించండి"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ఫ్యాక్టరీ డేటా డెమో ఖాతాను తొలగించి, సిస్టమ్‌ను రీసెట్ చేస్తుంది. మొత్తం వినియోగదారు డేటాను కోల్పోతారు."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"డెమో నుండి నిష్క్రమించండి"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"సెటప్‌ను పూర్తి చేయండి"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ఇప్పుడు వద్దు"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"డ్రైవింగ్ చేస్తున్నప్పుడు చర్య అందుబాటులో ఉండదు."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8819aff..534d826 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"ผู้มาเยือน"</string>
     <string name="user_switch" msgid="6544839750534690781">"เปลี่ยน"</string>
     <string name="current_user_name" msgid="3813671533249316823">"คุณ (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"ข้อมูลโปรไฟล์"</string>
     <string name="user_name_label" msgid="3210832645046206845">"ชื่อ"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"ไม่ได้ตั้งค่า"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"แก้ไขชื่อผู้ใช้"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"ผู้ใช้และบัญชี"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"ผู้ใช้"</string>
     <string name="account_list_title" msgid="7631588514613843065">"บัญชีของ <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"ลองอีกครั้ง"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"ข้าม"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"ตั้งค่าการล็อกหน้าจอ"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"เลือกรูปแบบของคุณ"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"การล็อกหน้าจอปัจจุบัน"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"ตั้งรูปแบบเพื่อความปลอดภัย"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"ล้าง"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"ตกลง"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"นำการล็อกหน้าจอออกไหม"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"การดำเนินการนี้จะทำให้ทุกคนเข้าถึงบัญชีของคุณได้"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"ป้อน PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"ป้อนรหัสผ่าน"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"ตั้ง PIN เพื่อความปลอดภัย"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"ป้อน PIN อีกครั้ง"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN จะต้องมีอย่างน้อย 4 หลัก"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN ไม่ถูกต้อง ต้องมีอย่างน้อย 4 หลัก"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN ไม่ตรงกัน"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"เกิดข้อผิดพลาดในการบันทึก PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN ไม่ถูกต้อง"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"รหัสผ่านไม่ถูกต้อง"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"ตั้งรหัสผ่านเพื่อความปลอดภัย"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"ป้อนรหัสผ่านอีกครั้ง"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"รหัสผ่านไม่ตรงกัน"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"ยกเลิก"</string>
     <string name="backspace_key" msgid="1545590866688979099">"ปุ่มลบถอยหลัง"</string>
     <string name="enter_key" msgid="2121394305541579468">"ปุ่ม Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ออกจากการสาธิตไหม"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"การลบบัญชีสาธิตและออกจากโหมดสาธิตจะต้องใช้การรีเซ็ตเป็นค่าเริ่มต้น"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ออกจากการสาธิต"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ออกจากโหมดสาธิต"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"การดำเนินการนี้จะลบบัญชีสาธิตและรีเซ็ตข้อมูลในระบบเป็นค่าเริ่มต้น ข้อมูลผู้ใช้ทั้งหมดจะสูญหาย"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ออกจากการสาธิต"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"ตั้งค่าให้เสร็จ"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ไว้ทีหลัง"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ดำเนินการไม่ได้ในขณะขับรถ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6ea8fd1..7982016 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Bisita"</string>
     <string name="user_switch" msgid="6544839750534690781">"Lumipat"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Ikaw (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Impormasyon sa profile"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Pangalan"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Hindi naka-set up"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"I-edit ang user name"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Mga user at account"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"User"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Mga account para kay <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Subukang Muli"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Laktawan"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Magtakda ng lock ng screen"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Pumili ng iyong pattern"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Kasalukuyang lock ng screen"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Para sa seguridad, magtakda ng pattern"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"I-clear"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Alisin ang lock ng screen?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Papayagan nito ang sinuman na i-access ang iyong content"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Ilagay ang iyong PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Ilagay ang iyong password"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Para sa seguridad, magtakda ng PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Ilagay ulit ang iyong PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Dapat ay may kahit 4 na digit ang PIN"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Invalid ang pin. Mayroon dapat itong kahit 4 na digit."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Hindi tugma ang mga PIN"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Nagka-error sa pag-save ng PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Mali ang PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Mali ang password"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Para sa seguridad, magtakda ng password"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Ilagay muli ang iyong password"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Hindi tugma ang mga password"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Kanselahin"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace key"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter key"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Lumabas sa Demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Kailangang mag-factory reset para ma-delete ang demo account at makalabas sa demo mode"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Lumabas sa Demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Lumabas sa demo mode"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ide-delete nito ang demo account at ire-reset ang factory data ng system. Mawawala ang lahat ng data ng user."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Lumabas sa Demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"tapusin ang pag-set up"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"huwag ngayon"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Hindi available ang pagkilos habang nagmamaneho."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bf462fa..68b8c37 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Misafir"</string>
     <string name="user_switch" msgid="6544839750534690781">"Değiştir"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Siz (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profil bilgileri"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Ad"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Yapılandırılmamış"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Kullanıcı adını düzenleme"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Kullanıcılar ve hesaplar"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Kullanıcı"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> adlı kullanıcının hesapları"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Tekrar dene"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Atla"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ekran kilidi ayarlama"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Deseninizi seçin"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Geçerli ekran kilidi"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Güvenlik için desen oluşturun"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Temizle"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"Tamam"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Ekran kilidi kaldırılsın mı?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Bu, başkalarının hesabınıza erişmesine izin verir"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN\'inizi girin"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Şifrenizi girin"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Güvenlik için PIN oluşturun"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"PIN\'inizi yeniden girin"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN en az 4 basamaklı olmalıdır"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN geçersiz, en az 4 basamaklı olmalıdır."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN\'ler eşleşmiyor"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN kaydedilirken hata oluştu"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Yanlış PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Yanlış şifre"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Güvenlik için şifre oluşturun"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Şifrenizi yeniden girin"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Şifreler eşleşmiyor"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"İptal et"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Geri tuşu"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter tuşu"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Demodan çıkılsın mı?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Demo hesabını silmek ve demo modundan çıkmak için fabrika ayarlarına sıfırlama işlemi gerekecektir"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Demodan çık"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Demo modundan çık"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Bu işlem, demo hesabını silecek ve sistemi fabrika verilerine sıfırlayacak. Tüm kullanıcı verileri kaybolacak."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demodan çık"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"kurulumu bitir"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"şimdi değil"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Araç kullanılırken bu işlem gerçekleştirilemez."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f4d278a..20a0eed 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -175,9 +175,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Гість"</string>
     <string name="user_switch" msgid="6544839750534690781">"Змінити користувача"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Ви (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Інформація профілю"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Ім’я"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Не налаштовано"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Змінити ім’я користувача"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Користувачі й обл. записи"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Користувач"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Облікові записи користувача <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -209,6 +209,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Повторити"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Пропустити"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Налаштуйте блокування екрана"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Створіть ключ"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Поточне блокування екрана"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"З міркувань безпеки налаштуйте ключ"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Очистити"</string>
@@ -225,12 +226,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Вимкнути блокування екрана?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Будь-хто зможе ввійти у ваш обліковий запис"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Введіть PIN-код"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Введіть пароль"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"З міркувань безпеки налаштуйте PIN-код"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Введіть PIN-код ще раз"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN-код має містити принаймні 4 цифри"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN-код недійсний. Він має складатися принаймні з 4 цифр."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN-коди не збігаються"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Не вдалося зберегти PIN-код"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Неправильний PIN-код"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Неправильний пароль"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"З міркувань безпеки налаштуйте пароль"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Введіть пароль ще раз"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Паролі не збігаються"</string>
@@ -294,8 +299,10 @@
     <string name="cancel" msgid="750286395700355455">"Скасувати"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Клавіша Backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Клавіша Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Вийти з демо-режиму?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Якщо видалити демонстраційний обліковий запис і вимкнути демо-режим, потрібно буде скинути параметри"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Вийти з демо-режиму"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Вийти з демо-режиму"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Буде видалено демонстраційний обліковий запис і відновлено заводські налаштування системи. Усі дані користувача буде втрачено."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Вийти з демо-режиму"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"завершити налаштування"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"не зараз"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Неможливо виконати дію під час руху автомобіля."</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index c45b925..beb8e05 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -173,9 +173,10 @@
     <string name="user_guest" msgid="3465399481257448601">"مہمان"</string>
     <string name="user_switch" msgid="6544839750534690781">"سوئچ کریں"</string>
     <string name="current_user_name" msgid="3813671533249316823">"آپ (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"پروفائل کی معلومات"</string>
     <string name="user_name_label" msgid="3210832645046206845">"نام"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"ترتیب نہیں دیا گیا"</string>
+    <!-- no translation found for edit_user_name_title (6890782937520262478) -->
+    <skip />
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"صارفین اور اکاؤنٹس"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"صارف"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> کے لئے اکاؤنٹس"</string>
@@ -194,24 +195,21 @@
     <string name="user_add_user_message_update" msgid="1528170913388932459">"کوئی بھی صارف دیگر سبھی صارفین کیلئے ایپس کو اپ ڈیٹ کر سکتا ہے۔"</string>
     <string name="security_settings_title" msgid="6955331714774709746">"سیکیورٹی"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"اسکرین لاک"</string>
-    <!-- no translation found for security_lock_none (1054645093754839638) -->
-    <skip />
+    <string name="security_lock_none" msgid="1054645093754839638">"کوئی نہیں"</string>
     <string name="security_lock_pattern" msgid="1174352995619563104">"پیٹرن"</string>
-    <!-- no translation found for security_lock_pin (4891899974369503200) -->
-    <skip />
+    <string name="security_lock_pin" msgid="4891899974369503200">"PIN"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"پاس ورڈ"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"لاک کی قسم منتخب کریں"</string>
     <string name="screen_lock_options" msgid="7023338635352915768">"اسکرین لاک کے اختیارات"</string>
-    <!-- no translation found for lock_settings_enter_pattern (4826034565853171624) -->
-    <skip />
+    <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"اپنا پیٹرن درج کریں"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"تصدیق کریں"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"دوبارہ ڈرا کریں"</string>
     <string name="continue_button_text" msgid="5129979170426836641">"جاری رکھیں"</string>
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"دوبارہ کوشش کریں"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"نظر انداز کریں"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"اسکرین لاک سیٹ کریں"</string>
-    <!-- no translation found for current_screen_lock (637651611145979587) -->
-    <skip />
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"اپنا پیٹرن منتخب کریں"</string>
+    <string name="current_screen_lock" msgid="637651611145979587">"موجودہ اسکرین لاک"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"سیکیورٹی کیلئے پیٹرن سیٹ کریں"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"صاف کریں"</string>
     <string name="lockpattern_cancel_button_text" msgid="4068764595622381766">"منسوخ کریں"</string>
@@ -225,16 +223,18 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"غیر مقفل کرنے کا پیٹرن ڈرا کرنے کا طریقہ"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"پیٹرن کو محفوظ کرنے میں خرابی"</string>
     <string name="okay" msgid="4589873324439764349">"ٹھیک ہے"</string>
-    <!-- no translation found for remove_screen_lock_title (1234382338764193387) -->
-    <skip />
-    <!-- no translation found for remove_screen_lock_message (6675850371585564965) -->
-    <skip />
+    <string name="remove_screen_lock_title" msgid="1234382338764193387">"اسکرین لاک کو ہٹائیں؟"</string>
+    <string name="remove_screen_lock_message" msgid="6675850371585564965">"اس سے کسی کو بھی آپ کے اکاؤنٹ تک رسائی کی اجازت ہوگی"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"اپنا PIN درج کریں"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"اپنا پاس ورڈ درج کریں"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"سیکیورٹی کیلئے PIN سیٹ کریں"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"اپنا PIN دوبارہ درج کریں"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN کا کم از کم 4 ہندسے کا ہونا ضروری ہے"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN غلط ہے، کم از کم 4 ہندسے ہونے چاہئیں۔"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PINs مماثل نہیں ہیں"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN محفوظ کرنے میں خرابی"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"غلط PIN"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"غلط پاس ورڈ"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"سیکیورٹی کیلئے پاس ورڈ سیٹ کریں"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"اپنا پاس ورڈ دوبارہ درج کریں"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"پاس ورڈز مماثل نہیں ہیں"</string>
@@ -286,8 +286,10 @@
     <string name="cancel" msgid="750286395700355455">"منسوخ کریں"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace کلید"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter کلید"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"ڈیمو سے باہر نکلیں؟"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"ڈیمو اکاؤنٹ اور موجودہ ڈیمو وضع کو حذف کرنے کے لیے ایک فیکٹری ری سیٹ کی ضرورت ہوگی"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"ڈیمو سے باہر نکلیں"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ڈیمو موڈ سے باہر نکلیں"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"اس سے ڈیمو اکاؤنٹ اور فیکٹری ڈیٹا کی دوبارہ ترتیب کا سسٹم حذف ہو جائے گا۔ تمام صارف ڈیٹا غائب ہو جائیں گے۔"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ڈیمو سے باہر نکلیں"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"سیٹ اپ مکمل کریں"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"ابھی نہیں"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"ڈرائیونگ کے دوران یہ عمل نہیں کیا جا سکتا۔"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index a133c38..0ab69d5 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Mehmon"</string>
     <string name="user_switch" msgid="6544839750534690781">"Almashtirish"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Siz (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Profil ma’lumotlari"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Ism"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Sozlanmagan"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Foydalanuvchi nomini tahrirlash"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Foydalanuvchilar va hisoblar"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Foydalanuvchi"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> – hisoblar"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Qayta urinish"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Tashlab ketish"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Ekran qulfini sozlang"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Grafik kalit yarating"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Joriy ekran qulfi"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Xavfsizlik uchun grafik kalit o‘rnating"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Tozalash"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Ekran qulfi olib tashlansinmi?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Bu hammaga hisobingizga kirish imkonini beradi"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"PIN kodni kiriting"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Parolni kiriting"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Xavfsizlik uchun PIN kod o‘rnating"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"PIN kodni qayta kiriting"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN kod kamida 4 ta raqamli bo‘lsin"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN kod yaroqsiz, kamida 5 ta raqamdan iborat bo‘lishi lozim."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN kodlar bir-biriga mos emas"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"PIN kod saqlanmadi"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN kod xato"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Parol xato"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Xavfsizlik uchun parol o‘rnating"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Parolni qayta kiriting"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Parollar bir xil terilmadi"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Bekor qilish"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace tugmasi"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter tugmasi"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Demodan chiqilsinmi?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Demo hisob va mavjud demo rejimni o‘chirib tashlash sozlamalarni asliga qaytarishni talab qiladi"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Demodan chiqish"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Demo rejimdan chiqing"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Bunda demo hisob o‘chirib tashlanadi va tizim zavod sozlamalariga qaytariladi. Barcha foydalanuvchi ma’lumotlari tozalab tashlanadi."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demodan chiqish"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"sozlashni tugatish"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"hozir emas"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Avtomobilda harakatlanayotganda amal ishlamaydi."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7b567d1..b1d47a4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Khách"</string>
     <string name="user_switch" msgid="6544839750534690781">"Nút chuyển"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Bạn (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Thông tin hồ sơ"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Tên"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Chưa thiết lập"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Chỉnh sửa tên người dùng"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Người dùng và tài khoản"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Người dùng"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Tài khoản cho <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Thử lại"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Bỏ qua"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Đặt khóa màn hình"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Chọn hình mở khóa của bạn"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Khóa màn hình hiện tại"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Để bảo mật, hãy đặt hình mở khóa"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Xóa"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"OK"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Xóa khóa màn hình?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Thao tác này sẽ cho phép bất cứ ai truy cập vào tài khoản của bạn"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Nhập mã PIN của bạn"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Nhập mật khẩu của bạn"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Để bảo mật, hãy đặt mã PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Nhập lại mã PIN của bạn"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN phải có ít nhất 4 chữ số"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Mã PIN không hợp lệ. Mã này phải có ít nhất 4 chữ số."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Các mã PIN không khớp"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Lỗi khi lưu mã PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Mã PIN sai"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Mật khẩu sai"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Để bảo mật, hãy đặt mật khẩu"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Nhập lại mật khẩu của bạn"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Mật khẩu không khớp"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Hủy"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Phím xóa lùi (Backspace)"</string>
     <string name="enter_key" msgid="2121394305541579468">"Phím Enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Thoát chế độ demo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Để xóa tài khoản demo và thoát khỏi chế độ demo, bạn cần khôi phục cài đặt gốc"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Thoát chế độ demo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Thoát chế độ demo"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Thao tác này sẽ xóa tài khoản demo và thiết lập lại dữ liệu ban đầu cho hệ thống. Tất cả dữ liệu người dùng sẽ bị mất."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Thoát chế độ demo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"hoàn tất thiết lập"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"để sau"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Bạn không thể thực hiện hành động này trong khi lái xe."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5354075..2545c00 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"访客"</string>
     <string name="user_switch" msgid="6544839750534690781">"开关"</string>
     <string name="current_user_name" msgid="3813671533249316823">"您 (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"个人资料信息"</string>
     <string name="user_name_label" msgid="3210832645046206845">"名称"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"未设置"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"修改用户名称"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"用户和帐号"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"用户"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>的帐号"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"重试"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"跳过"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"设置屏幕锁定"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"选择您的图案"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"当前屏幕锁定设置"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"为了安全起见,请设置解锁图案"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"清除"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"确定"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"清除屏幕锁定设置"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"这样一来,任何人都能访问您的帐号"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"输入您的 PIN 码"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"输入您的密码"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"为了安全起见,请设置 PIN 码"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"重新输入 PIN 码"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN 码必须至少为 4 位数"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN 码无效,必须至少包含 4 位数。"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN 码不一致"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"保存 PIN 码时出错"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN 码错误"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"密码错误"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"为了安全起见,请设置密码"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"重新输入密码"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"密码不匹配"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"取消"</string>
     <string name="backspace_key" msgid="1545590866688979099">"退格键"</string>
     <string name="enter_key" msgid="2121394305541579468">"输入密钥"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"要退出演示模式吗?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"必须恢复出厂设置才能删除演示帐号以及退出演示模式"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"退出演示模式"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"退出演示模式"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"这项操作会删除演示帐号并将系统恢复出厂设置,且所有用户数据都会丢失。"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"退出演示模式"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"完成设置"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"以后再说"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"无法在驾驶时执行此操作。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 63466d0..f34b928 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"訪客"</string>
     <string name="user_switch" msgid="6544839750534690781">"切換"</string>
     <string name="current_user_name" msgid="3813671533249316823">"你 (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"個人資料資訊"</string>
     <string name="user_name_label" msgid="3210832645046206845">"名稱"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"尚未設定"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"編輯使用者名稱"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"使用者和帳戶"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"使用者"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> 的帳戶"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"重試"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"略過"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"設定螢幕鎖定"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"選擇圖案"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"目前的螢幕鎖定方式"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"為了安全起見,請設定圖案"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"清除"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"確定"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"要移除螢幕鎖定嗎?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"這樣,任何人都能存取您的帳戶"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"請輸入 PIN"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"請輸入密碼"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"為了安全起見,請設定 PIN 碼"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"請重新輸入 PIN 碼"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN 碼至少要有 4 個數字"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN 無效,必須至少有 4 位數字。"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN 碼不符"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"儲存 PIN 碼時發生錯誤"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN 錯誤"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"密碼錯誤"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"為了安全起見,請設定密碼"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"請重新輸入密碼"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"密碼不符"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"取消"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace 鍵"</string>
     <string name="enter_key" msgid="2121394305541579468">"輸入密鑰"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"要結束示範模式嗎?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"必需回復原廠設定,才能刪除示範帳戶並退出演示模式"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"結束示範模式"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"結束示範模式"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"執行這項操作後,示範模式帳戶會刪除,而系統會回復原廠設定。所有使用者資料將會失去。"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"結束示範模式"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"完成設定"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"暫時不要"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"無法在駕駛時執行此操作。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index abafce2..e07d2dc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"訪客"</string>
     <string name="user_switch" msgid="6544839750534690781">"切換"</string>
     <string name="current_user_name" msgid="3813671533249316823">"你 (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"個人資料資訊"</string>
     <string name="user_name_label" msgid="3210832645046206845">"名稱"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"尚未設定"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"編輯使用者名稱"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"使用者和帳戶"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"使用者"</string>
     <string name="account_list_title" msgid="7631588514613843065">"<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g> 的帳戶"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"重試"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"略過"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"設定螢幕鎖定"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"選擇圖案"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"目前的螢幕鎖定方式"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"為了安全起見,請設定圖案"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"清除"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"確定"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"要移除螢幕鎖定嗎?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"這樣一來,任何人都能存取你的帳戶"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"輸入 PIN 碼"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"輸入你的密碼"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"為了安全起見,請設定 PIN 碼"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"請重新輸入 PIN 碼"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN 碼至少要有 4 個數字"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"PIN 碼無效,至少要有 4 個數字。"</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"PIN 碼不符"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"儲存 PIN 碼時發生錯誤"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"PIN 碼錯誤"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"密碼錯誤"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"為了安全起見,請設定密碼"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"請重新輸入密碼"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"密碼不符"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"取消"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace 鍵"</string>
     <string name="enter_key" msgid="2121394305541579468">"Enter 鍵"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"要結束示範模式嗎?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"必須恢復原廠設定才能刪除示範帳戶及結束示範模式"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"結束示範模式"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"結束示範模式"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"這項操作會刪除示範帳戶並將系統恢復原廠設定,且所有使用者資料都會遺失。"</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"結束示範模式"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"完成設定"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"暫時不要"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"無法在開車期間執行這項操作。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 784e270..5fd5e84 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -173,9 +173,9 @@
     <string name="user_guest" msgid="3465399481257448601">"Isivakashi"</string>
     <string name="user_switch" msgid="6544839750534690781">"Shintsha"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Wena (%1$s)"</string>
-    <string name="user_settings_details_title" msgid="3016069827765597036">"Ulwazi lwephrofayela"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Igama"</string>
     <string name="user_summary_not_set_up" msgid="1473688119241224145">"Akusethiwe"</string>
+    <string name="edit_user_name_title" msgid="6890782937520262478">"Hlela igama lomsebenzisi"</string>
     <string name="user_and_account_settings_title" msgid="1542965868877207832">"Abasebenzisi nama-akhawunti"</string>
     <string name="user_settings_title" msgid="5511846421187697406">"Umsebenzisi"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Ama-akhawunti e-<xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
@@ -207,6 +207,7 @@
     <string name="lockscreen_retry_button_text" msgid="5314212350698701242">"Zama futhi"</string>
     <string name="lockscreen_skip_button_text" msgid="3755748786396198091">"Yeqa"</string>
     <string name="set_screen_lock" msgid="5239317292691332780">"Setha ukukhiya kwesikrini"</string>
+    <string name="lockscreen_choose_your_pattern" msgid="6801175111142593404">"Khetha iphathini yakho"</string>
     <string name="current_screen_lock" msgid="637651611145979587">"Ukukhiya isikrini kwamanje"</string>
     <string name="choose_lock_pattern_message" msgid="6242765203541309524">"Ngokuphepha, setha iphethini"</string>
     <string name="lockpattern_retry_button_text" msgid="4655398824001857843">"Sula"</string>
@@ -223,12 +224,16 @@
     <string name="okay" msgid="4589873324439764349">"KULUNGILE"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Susa isikrini sokukhiya?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Lokhu kuzovumela wonke umuntu ukufinyelela i-akhawunti yakho"</string>
+    <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Faka iPHINIKHODI yakho"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Faka iphasiwedi yakho"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Ngokuphepha, setha i-PIN"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Faka kabusha i-PIN yakho"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"Iphinikhodi kumele okungenani ibe ngamadijithi angu-4"</string>
     <string name="lockpin_invalid_pin" msgid="2149191577096327424">"Iphinikhodi ayivumelekile, kumele okungenani ibe amadijithi angu-4."</string>
     <string name="confirm_pins_dont_match" msgid="4607110139373520720">"Ama-PIN awafani"</string>
     <string name="error_saving_lockpin" msgid="9011960139736000393">"Iphutha ukulondoloza i-PIN"</string>
+    <string name="lockscreen_wrong_pin" msgid="4922465731473805306">"Iphinikhodi engalungile"</string>
+    <string name="lockscreen_wrong_password" msgid="5757087577162231825">"Iphasiwedi engalungile"</string>
     <string name="choose_lock_password_message" msgid="6124341145027370784">"Ngokuphepha, setha iphasiwedi"</string>
     <string name="confirm_your_password_header" msgid="7052891840366724938">"Faka kabusha iphasiwedi yakho"</string>
     <string name="confirm_passwords_dont_match" msgid="7300229965206501753">"Amaphasiwedi awafani"</string>
@@ -280,8 +285,10 @@
     <string name="cancel" msgid="750286395700355455">"Khansela"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Ukhiye we-backspace"</string>
     <string name="enter_key" msgid="2121394305541579468">"Ukhiye we-enter"</string>
-    <string name="exit_retail_title" msgid="4514319631081146178">"Phuma kudemo?"</string>
-    <string name="exit_retail_message" msgid="1426206128187780964">"Ukususa i-akhawunti yedemo nokuphuma kumodi yedemo kuzodinga ukusetha kabusha kwefektrhi"</string>
+    <string name="exit_retail_button_text" msgid="6093240315583384473">"Phuma kudemo"</string>
+    <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"Phuma kumodi yedemo"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Lokhu kuzosusa i-akhawunti ye-demo futhi isethe kabusha idatha yesistimu. Yonke idatha yomsebenzisi izolahleka."</string>
+    <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Phuma kudemo"</string>
     <string name="suggestion_primary_button" msgid="6421115494714083020">"qedela ukusetha"</string>
     <string name="suggestion_secondary_button" msgid="7075088546904464681">"hhayi manje"</string>
     <string name="restricted_while_driving" msgid="478954379611786852">"Isenzo asitholakali ngenkathi ushayela."</string>