diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml
index 8056a31cbfc74..0442ba20f8dbf 100644
--- a/packages/SettingsLib/res/values-af/strings.xml
+++ b/packages/SettingsLib/res/values-af/strings.xml
@@ -568,12 +568,9 @@
"Verwyder gas"
"Stel gassessie terug"
"Gas"
-
-
-
-
-
-
+ "Stel gassessie terug?"
+ "Stel terug"
+ "Stel tans gassessie terug …"
"Neem \'n foto"
"Kies \'n prent"
"Kies foto"
diff --git a/packages/SettingsLib/res/values-as/strings.xml b/packages/SettingsLib/res/values-as/strings.xml
index 87dc3366df966..f14dd0bfb099e 100644
--- a/packages/SettingsLib/res/values-as/strings.xml
+++ b/packages/SettingsLib/res/values-as/strings.xml
@@ -79,7 +79,7 @@
"সংযোগ কৰা হ’ল (কোনো ফ\'ন বা মিডিয়া নাই), বেটাৰিৰ স্তৰ %1$s%2$s"
"সক্ৰিয়, %1$s বেটাৰি"
"সক্ৰিয়, L: %1$s বেটাৰি, R: %2$s বেটাৰি"
- "%1$s বেটাৰি"
+ "%1$s বেটাৰী"
"L: %1$s বেটাৰি, R: %2$s বেটাৰি"
"সক্ৰিয়"
"মিডিয়াৰ অডিঅ’"
diff --git a/packages/SettingsLib/res/values-az/strings.xml b/packages/SettingsLib/res/values-az/strings.xml
index eb0c74a8a5929..2f75514a14d92 100644
--- a/packages/SettingsLib/res/values-az/strings.xml
+++ b/packages/SettingsLib/res/values-az/strings.xml
@@ -454,7 +454,7 @@
"%1$s - %2$s"
"Tam şarj edilənədək %1$s qalıb"
"%1$s - tam şarj edilənədək %2$s qalıb"
- "%1$s - Şarj müvəqqəti olaraq məhdudlaşdırılıb"
+ "%1$s - Şarj müvəqqəti məhdudlaşdırılıb"
"Naməlum"
"Enerji doldurma"
"Sürətlə doldurulur"
diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
index 52cf443e0cfa9..32a08ad1e3cc2 100644
--- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
+++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml
@@ -569,12 +569,9 @@
"Ukloni gosta"
"Resetuj sesiju gosta"
"Gost"
-
-
-
-
-
-
+ "Želite li da resetujete sesiju gosta?"
+ "Resetuj"
+ "Sesija gosta se resetuje…"
"Slikaj"
"Odaberi sliku"
"Izaberite sliku"
diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml
index 4b3dbe4faa8ab..78aea784319c5 100644
--- a/packages/SettingsLib/res/values-bg/strings.xml
+++ b/packages/SettingsLib/res/values-bg/strings.xml
@@ -568,12 +568,9 @@
"Премахване на госта"
"Нулиране на сесията като гост"
"Гост"
-
-
-
-
-
-
+ "Да се нулира ли сесията като гост?"
+ "Нулиране"
+ "Сесията като гост се нулира…"
"Правене на снимка"
"Избиране на изображение"
"Избиране на снимката"
diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml
index 029d62e1bf451..26b2db461e521 100644
--- a/packages/SettingsLib/res/values-bs/strings.xml
+++ b/packages/SettingsLib/res/values-bs/strings.xml
@@ -569,12 +569,9 @@
"Ukloni gosta"
"Poništi sesiju gosta"
"Gost"
-
-
-
-
-
-
+ "Poništiti sesiju gosta?"
+ "Poništi"
+ "Poništavanje sesije gosta…"
"Snimite fotografiju"
"Odaberite sliku"
"Odabir fotografije"
diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml
index 9a18268ae0d5f..9bf28cbf2684b 100644
--- a/packages/SettingsLib/res/values-el/strings.xml
+++ b/packages/SettingsLib/res/values-el/strings.xml
@@ -568,12 +568,9 @@
"Κατάργηση επισκέπτη"
"Επαναφορά περιόδου επισκέπτη"
"Επισκέπτης"
-
-
-
-
-
-
+ "Επαναφορά επισκέπτη;"
+ "Επαναφορά"
+ "Επαναφορά επισκέπτη…"
"Λήψη φωτογραφίας"
"Επιλογή εικόνας"
"Επιλογή φωτογραφίας"
diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml
index d4ef0739a6ceb..c1d4ab8410e31 100644
--- a/packages/SettingsLib/res/values-en-rAU/strings.xml
+++ b/packages/SettingsLib/res/values-en-rAU/strings.xml
@@ -568,12 +568,9 @@
"Remove guest"
"Reset guest"
"Guest"
-
-
-
-
-
-
+ "Reset guest?"
+ "Reset"
+ "Resetting guest…"
"Take a photo"
"Choose an image"
"Select photo"
diff --git a/packages/SettingsLib/res/values-en-rCA/strings.xml b/packages/SettingsLib/res/values-en-rCA/strings.xml
index 62e204d4231ea..c9fc70dc04b69 100644
--- a/packages/SettingsLib/res/values-en-rCA/strings.xml
+++ b/packages/SettingsLib/res/values-en-rCA/strings.xml
@@ -568,12 +568,9 @@
"Remove guest"
"Reset guest"
"Guest"
-
-
-
-
-
-
+ "Reset guest?"
+ "Reset"
+ "Resetting guest…"
"Take a photo"
"Choose an image"
"Select photo"
diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml
index d4ef0739a6ceb..c1d4ab8410e31 100644
--- a/packages/SettingsLib/res/values-en-rGB/strings.xml
+++ b/packages/SettingsLib/res/values-en-rGB/strings.xml
@@ -568,12 +568,9 @@
"Remove guest"
"Reset guest"
"Guest"
-
-
-
-
-
-
+ "Reset guest?"
+ "Reset"
+ "Resetting guest…"
"Take a photo"
"Choose an image"
"Select photo"
diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml
index d4ef0739a6ceb..c1d4ab8410e31 100644
--- a/packages/SettingsLib/res/values-en-rIN/strings.xml
+++ b/packages/SettingsLib/res/values-en-rIN/strings.xml
@@ -568,12 +568,9 @@
"Remove guest"
"Reset guest"
"Guest"
-
-
-
-
-
-
+ "Reset guest?"
+ "Reset"
+ "Resetting guest…"
"Take a photo"
"Choose an image"
"Select photo"
diff --git a/packages/SettingsLib/res/values-en-rXC/strings.xml b/packages/SettingsLib/res/values-en-rXC/strings.xml
index b6acd899f27ad..0212719dad919 100644
--- a/packages/SettingsLib/res/values-en-rXC/strings.xml
+++ b/packages/SettingsLib/res/values-en-rXC/strings.xml
@@ -568,12 +568,9 @@
"Remove guest"
"Reset guest"
"Guest"
-
-
-
-
-
-
+ "Reset guest?"
+ "Reset"
+ "Resetting guest…"
"Take a photo"
"Choose an image"
"Select photo"
diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml
index bb3413f08a077..7755cb74b04f4 100644
--- a/packages/SettingsLib/res/values-es-rUS/strings.xml
+++ b/packages/SettingsLib/res/values-es-rUS/strings.xml
@@ -568,12 +568,9 @@
"Quitar invitado"
"Restablecer perfil de invitado"
"Invitado"
-
-
-
-
-
-
+ "¿Quieres restablecer el invitado?"
+ "Restablecer"
+ "Restableciendo invitado…"
"Tomar una foto"
"Elegir una imagen"
"Seleccionar foto"
diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml
index 75892e214a2bf..3b56ce72aa74f 100644
--- a/packages/SettingsLib/res/values-es/strings.xml
+++ b/packages/SettingsLib/res/values-es/strings.xml
@@ -568,12 +568,9 @@
"Quitar invitado"
"Restablecer invitado"
"Invitado"
-
-
-
-
-
-
+ "¿Restablecer invitado?"
+ "Restablecer"
+ "Restableciendo invitado…"
"Hacer foto"
"Seleccionar una imagen"
"Seleccionar foto"
diff --git a/packages/SettingsLib/res/values-et/strings.xml b/packages/SettingsLib/res/values-et/strings.xml
index f7de768e0dd81..d835cb95ed984 100644
--- a/packages/SettingsLib/res/values-et/strings.xml
+++ b/packages/SettingsLib/res/values-et/strings.xml
@@ -568,12 +568,9 @@
"Eemalda külaline"
"Lähtesta külastajaseanss"
"Külaline"
-
-
-
-
-
-
+ "Kas lähtestada külastajaseanss?"
+ "Lähtesta"
+ "Külastajaseansi lähtestamine …"
"Pildistage"
"Valige pilt"
"Valige foto"
diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml
index 43d640c44f2ac..51884f3988015 100644
--- a/packages/SettingsLib/res/values-hr/strings.xml
+++ b/packages/SettingsLib/res/values-hr/strings.xml
@@ -569,12 +569,9 @@
"Uklanjanje gosta"
"Poništi gostujuću sesiju"
"Gost"
-
-
-
-
-
-
+ "Poništiti gostujuću sesiju?"
+ "Poništi"
+ "Poništavanje gostujuće sesije…"
"Fotografiraj"
"Odaberi sliku"
"Odabir slike"
diff --git a/packages/SettingsLib/res/values-hy/strings.xml b/packages/SettingsLib/res/values-hy/strings.xml
index 168ab43e57650..766eb383dffa5 100644
--- a/packages/SettingsLib/res/values-hy/strings.xml
+++ b/packages/SettingsLib/res/values-hy/strings.xml
@@ -568,12 +568,9 @@
"Հեռացնել հյուրին"
"Վերակայել հյուրի աշխատաշրջանը"
"Հյուր"
-
-
-
-
-
-
+ "Վերակայե՞լ հյուրի աշխատաշրջանը"
+ "Վերակայել"
+ "Հյուրի աշխատաշրջանը վերակայվում է…"
"Լուսանկարել"
"Ընտրել պատկեր"
"Ընտրեք լուսանկար"
diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml
index 0d98614b6521a..dd3b00b718897 100644
--- a/packages/SettingsLib/res/values-ja/strings.xml
+++ b/packages/SettingsLib/res/values-ja/strings.xml
@@ -73,14 +73,14 @@
"接続済み(メディアなし): %1$s"
"接続済み(メッセージ アクセスなし): %1$s"
"接続済み(電話、メディアなし): %1$s"
- "接続済み、電池残量 %1$s: %2$s"
- "接続済み(電話なし)、電池残量 %1$s: %2$s"
- "接続済み(メディアなし)、電池残量 %1$s: %2$s"
- "接続済み(電話、メディアなし)、電池残量 %1$s: %2$s"
+ "接続済み、バッテリー残量 %1$s: %2$s"
+ "接続済み(電話なし)、バッテリー残量 %1$s: %2$s"
+ "接続済み(メディアなし)、バッテリー残量 %1$s: %2$s"
+ "接続済み(電話、メディアなし)、バッテリー残量 %1$s: %2$s"
"有効、電池 %1$s"
- "有効、L: 電池残量 %1$s、R: 電池残量 %2$s"
- "電池 %1$s"
- "L: 電池残量 %1$s、R: 電池残量 %2$s"
+ "有効、L: バッテリー残量 %1$s、R: バッテリー残量 %2$s"
+ "バッテリー %1$s"
+ "L: バッテリー残量 %1$s、R: バッテリー残量 %2$s"
"有効"
"メディアの音声"
"電話"
@@ -568,12 +568,9 @@
"ゲストを削除"
"ゲストをリセット"
"ゲスト"
-
-
-
-
-
-
+ "ゲストをリセットしますか?"
+ "リセット"
+ "ゲストをリセットしています…"
"写真を撮る"
"画像を選択"
"写真を選択"
diff --git a/packages/SettingsLib/res/values-kn/strings.xml b/packages/SettingsLib/res/values-kn/strings.xml
index d40f256e5db9a..78a67f453e7ca 100644
--- a/packages/SettingsLib/res/values-kn/strings.xml
+++ b/packages/SettingsLib/res/values-kn/strings.xml
@@ -452,8 +452,8 @@
"ಟ್ಯಾಬ್ಲೆಟ್ ಶೀಘ್ರದಲ್ಲೇ ಶಟ್ ಡೌನ್ ಆಗಬಹುದು (%1$s)"
"ಸಾಧನವು ಶೀಘ್ರದಲ್ಲೇ ಶಟ್ ಡೌನ್ ಆಗಬಹುದು (%1$s)"
"%1$s - %2$s"
- "ಭರ್ತಿಯಾಗುವವರೆಗೂ %1$s - ಉಳಿದಿದೆ"
- "ಭರ್ತಿಯಾಗುವವರೆಗೂ %1$s - %2$s ಉಳಿದಿದೆ"
+ "%1$s - ಸಮಯದಲ್ಲಿ ಪೂರ್ತಿ ಚಾರ್ಜ್ ಆಗುತ್ತದೆ"
+ "%1$s - %2$s ಸಮಯದಲ್ಲಿ ಪೂರ್ತಿ ಚಾರ್ಜ್ ಆಗುತ್ತದೆ"
"%1$s - ಚಾರ್ಜಿಂಗ್ ತಾತ್ಕಾಲಿಕವಾಗಿ ಸೀಮಿತವಾಗಿದೆ"
"ಅಪರಿಚಿತ"
"ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"
diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml
index 82f4d1ea49f7b..68fe19647dc29 100644
--- a/packages/SettingsLib/res/values-ko/strings.xml
+++ b/packages/SettingsLib/res/values-ko/strings.xml
@@ -429,7 +429,7 @@
"기기에 색상이 표시되는 방식을 조정합니다. 다음과 같은 상황에서 유용합니다.<br/><br/> <ol> <li> 색상을 더욱 정확하게 보고 싶을 때</li> <li> 집중을 위해 색상을 제거하고 싶을 때</li> </ol>"
"%1$s 우선 적용됨"
"%1$s, %2$s"
- "남은 시간 약 %1$s"
+ "남은 시간: 약 %1$s"
"남은 시간 약 %1$s(%2$s)"
"내 사용량을 기준으로 약 %1$s 남음"
"내 사용량(%2$s)을 기준으로 약 %1$s 남음"
diff --git a/packages/SettingsLib/res/values-lo/strings.xml b/packages/SettingsLib/res/values-lo/strings.xml
index 748f399bbc631..462b53f5d5e0a 100644
--- a/packages/SettingsLib/res/values-lo/strings.xml
+++ b/packages/SettingsLib/res/values-lo/strings.xml
@@ -568,12 +568,9 @@
"ລຶບແຂກອອກ"
"ຣີເຊັດແຂກ"
"ແຂກ"
-
-
-
-
-
-
+ "ຣີເຊັດແຂກບໍ?"
+ "ຣີເຊັດ"
+ "ກຳລັງຣີເຊັດແຂກ…"
"ຖ່າຍຮູບ"
"ເລືອກຮູບ"
"ເລືອກຮູບ"
diff --git a/packages/SettingsLib/res/values-mk/strings.xml b/packages/SettingsLib/res/values-mk/strings.xml
index 4ac7dbaf093d1..f1f163959d939 100644
--- a/packages/SettingsLib/res/values-mk/strings.xml
+++ b/packages/SettingsLib/res/values-mk/strings.xml
@@ -568,12 +568,9 @@
"Отстрани гостин"
"Ресетирајте го гостинот"
"Гостин"
-
-
-
-
-
-
+ "Да се ресетира гостинот?"
+ "Ресетирај"
+ "Се ресетира гостинот…"
"Фотографирајте"
"Одберете слика"
"Изберете фотографија"
diff --git a/packages/SettingsLib/res/values-mn/strings.xml b/packages/SettingsLib/res/values-mn/strings.xml
index 2023e7c871d78..5ac22ffbf751d 100644
--- a/packages/SettingsLib/res/values-mn/strings.xml
+++ b/packages/SettingsLib/res/values-mn/strings.xml
@@ -568,12 +568,9 @@
"Зочин хасах"
"Зочныг шинэчлэх"
"Зочин"
-
-
-
-
-
-
+ "Зочныг шинэчлэх үү?"
+ "Шинэчлэх"
+ "Зочныг шинэчилж байна…"
"Зураг авах"
"Зураг сонгох"
"Зураг сонгох"
diff --git a/packages/SettingsLib/res/values-mr/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml
index 5f622a1d87a49..ea6716595d163 100644
--- a/packages/SettingsLib/res/values-mr/strings.xml
+++ b/packages/SettingsLib/res/values-mr/strings.xml
@@ -568,12 +568,9 @@
"अतिथी काढून टाका"
"अतिथी सेशन रीसेट करा"
"अतिथी"
-
-
-
-
-
-
+ "अतिथीला रीसेट करायचे आहे का?"
+ "रीसेट करा"
+ "अतिथीला रीसेट करत आहे…"
"फोटो काढा"
"इमेज निवडा"
"फोटो निवडा"
diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml
index ece79650ba7c5..f39c0dccec8b9 100644
--- a/packages/SettingsLib/res/values-nb/strings.xml
+++ b/packages/SettingsLib/res/values-nb/strings.xml
@@ -568,12 +568,9 @@
"Fjern gjesten"
"Tilbakestill gjest"
"Gjest"
-
-
-
-
-
-
+ "Vil du tilbakestille gjesten?"
+ "Tilbakestill"
+ "Tilbakestiller gjesten …"
"Ta et bilde"
"Velg et bilde"
"Velg et bilde"
diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml
index c13e8a9398021..017de6a6d4620 100644
--- a/packages/SettingsLib/res/values-nl/strings.xml
+++ b/packages/SettingsLib/res/values-nl/strings.xml
@@ -568,12 +568,9 @@
"Gast verwijderen"
"Gastsessie resetten"
"Gast"
-
-
-
-
-
-
+ "Gast resetten?"
+ "Resetten"
+ "Gast resetten…"
"Foto maken"
"Afbeelding kiezen"
"Foto selecteren"
diff --git a/packages/SettingsLib/res/values-si/strings.xml b/packages/SettingsLib/res/values-si/strings.xml
index ca920a1ee848d..ecd288862ade0 100644
--- a/packages/SettingsLib/res/values-si/strings.xml
+++ b/packages/SettingsLib/res/values-si/strings.xml
@@ -568,12 +568,9 @@
"අමුත්තා ඉවත් කරන්න"
"ආගන්තුකයා යළි සකසන්න"
"අමුත්තා"
-
-
-
-
-
-
+ "අමුත්තා යළි සකසන්නද?"
+ "යළි සකසන්න"
+ "අමුත්තා යළි සකසමින්…"
"ඡායාරූපයක් ගන්න"
"රූපයක් තෝරන්න"
"ඡායාරූපය තෝරන්න"
diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml
index 5cba5cb98f2cd..490d3aaef0e29 100644
--- a/packages/SettingsLib/res/values-sl/strings.xml
+++ b/packages/SettingsLib/res/values-sl/strings.xml
@@ -570,12 +570,9 @@
"Odstranitev gosta"
"Ponastavi gosta"
"Gost"
-
-
-
-
-
-
+ "Želite ponastaviti gosta?"
+ "Ponastavi"
+ "Ponastavljanje gosta …"
"Fotografiranje"
"Izberi sliko"
"Izbira fotografije"
diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml
index c6dbd002a814e..171ec75173170 100644
--- a/packages/SettingsLib/res/values-sr/strings.xml
+++ b/packages/SettingsLib/res/values-sr/strings.xml
@@ -569,12 +569,9 @@
"Уклони госта"
"Ресетуј сесију госта"
"Гост"
-
-
-
-
-
-
+ "Желите ли да ресетујете сесију госта?"
+ "Ресетуј"
+ "Сесија госта се ресетује…"
"Сликај"
"Одабери слику"
"Изаберите слику"
diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml
index fdfd5eac444cd..96e089071a159 100644
--- a/packages/SettingsLib/res/values-sw/strings.xml
+++ b/packages/SettingsLib/res/values-sw/strings.xml
@@ -452,9 +452,9 @@
"Huenda kompyuta kibao ikazima hivi karibuni (%1$s)"
"Huenda kifaa kikazima hivi karibuni (%1$s)"
"%1$s - %2$s"
- "Zimesalia %1$s hadi ijae chaji"
- "%1$s - %2$s zimesalia hadi ijae chaji"
- "%1$s - Hali ya kuchaji kwa muda imedhibitiwa"
+ "Zimesalia %1$s ijae chaji"
+ "%1$s - %2$s zimesalia ijae chaji"
+ "%1$s - Kuchaji kumedhibitiwa kwa muda"
"Haijulikani"
"Inachaji"
"Inachaji kwa kasi"