Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java
index 7863102..5b8addf 100644
--- a/core/java/android/app/StatusBarManager.java
+++ b/core/java/android/app/StatusBarManager.java
@@ -22,6 +22,7 @@
 import android.os.RemoteException;
 import android.os.IBinder;
 import android.os.ServiceManager;
+import android.util.Slog;
 import android.view.View;
 
 import com.android.internal.statusbar.IStatusBarService;
@@ -61,8 +62,17 @@
 
     StatusBarManager(Context context) {
         mContext = context;
-        mService = IStatusBarService.Stub.asInterface(
-                ServiceManager.getService(Context.STATUS_BAR_SERVICE));
+    }
+
+    private synchronized IStatusBarService getService() {
+        if (mService == null) {
+            mService = IStatusBarService.Stub.asInterface(
+                    ServiceManager.getService(Context.STATUS_BAR_SERVICE));
+            if (mService == null) {
+                Slog.w("StatusBarManager", "warning: no STATUS_BAR_SERVICE");
+            }
+        }
+        return mService;
     }
 
     /**
@@ -71,8 +81,9 @@
      */
     public void disable(int what) {
         try {
-            if (mService != null) {
-                mService.disable(what, mToken, mContext.getPackageName());
+            final IStatusBarService svc = getService();
+            if (svc != null) {
+                svc.disable(what, mToken, mContext.getPackageName());
             }
         } catch (RemoteException ex) {
             // system process is dead anyway.
@@ -85,7 +96,10 @@
      */
     public void expand() {
         try {
-            mService.expand();
+            final IStatusBarService svc = getService();
+            if (svc != null) {
+                svc.expand();
+            }
         } catch (RemoteException ex) {
             // system process is dead anyway.
             throw new RuntimeException(ex);
@@ -97,7 +111,10 @@
      */
     public void collapse() {
         try {
-            mService.collapse();
+            final IStatusBarService svc = getService();
+            if (svc != null) {
+                svc.collapse();
+            }
         } catch (RemoteException ex) {
             // system process is dead anyway.
             throw new RuntimeException(ex);
@@ -106,8 +123,11 @@
 
     public void setIcon(String slot, int iconId, int iconLevel, String contentDescription) {
         try {
-            mService.setIcon(slot, mContext.getPackageName(), iconId, iconLevel,
+            final IStatusBarService svc = getService();
+            if (svc != null) {
+                svc.setIcon(slot, mContext.getPackageName(), iconId, iconLevel,
                     contentDescription);
+            }
         } catch (RemoteException ex) {
             // system process is dead anyway.
             throw new RuntimeException(ex);
@@ -116,7 +136,10 @@
 
     public void removeIcon(String slot) {
         try {
-            mService.removeIcon(slot);
+            final IStatusBarService svc = getService();
+            if (svc != null) {
+                svc.removeIcon(slot);
+            }
         } catch (RemoteException ex) {
             // system process is dead anyway.
             throw new RuntimeException(ex);
@@ -125,7 +148,10 @@
 
     public void setIconVisibility(String slot, boolean visible) {
         try {
-            mService.setIconVisibility(slot, visible);
+            final IStatusBarService svc = getService();
+            if (svc != null) {
+                svc.setIconVisibility(slot, visible);
+            }
         } catch (RemoteException ex) {
             // system process is dead anyway.
             throw new RuntimeException(ex);
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 45834a0..1b5c4cd 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -665,16 +665,11 @@
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Моля, поставете SIM карта."</string>
     <string name="lockscreen_missing_sim_instructions_long" msgid="7138450788301444298">"SIM картата липсва или е нечетима. Моля, поставете SIM карта."</string>
     <string name="lockscreen_permanent_disabled_sim_instructions" msgid="1631853574702335453">"SIM картата ви е деактивирана за постоянно."\n" Моля, свържете се с оператора на безжичната си връзка, за да получите друга."</string>
-    <!-- no translation found for lockscreen_transport_prev_description (201594905152746886) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_next_description (6089297650481292363) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_pause_description (7659088786780128001) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_play_description (5888422938351019426) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_stop_description (4562318378766987601) -->
-    <skip />
+    <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"Бутон за предишния запис"</string>
+    <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"Бутон за следващия запис"</string>
+    <string name="lockscreen_transport_pause_description" msgid="7659088786780128001">"Бутон за пауза"</string>
+    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Бутон за пускане"</string>
+    <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Бутон за спиране"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"Само спешни обаждания"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Мрежата е заключена"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM картата е заключена с PUK."</string>
@@ -704,14 +699,10 @@
     <string name="lockscreen_unlock_label" msgid="737440483220667054">"Отключване"</string>
     <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Включване на звука"</string>
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Изключване на звука"</string>
-    <!-- no translation found for lockscreen_access_pattern_start (3941045502933142847) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cleared (5583479721001639579) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cell_added (6756031208359292487) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_detected (4988730895554057058) -->
-    <skip />
+    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Фигурата е започната"</string>
+    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Фигурата е изчистена"</string>
+    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Клетката е добавена"</string>
+    <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Фигурата е завършена"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"АБВ"</string>
     <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index f3aa280..5e48efb 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -320,10 +320,10 @@
     <string name="permlab_broadcastSticky" msgid="7919126372606881614">"odeslání trvalého vysílání"</string>
     <string name="permdesc_broadcastSticky" product="tablet" msgid="6322249605930062595">"Umožňuje aplikaci odeslat trvalá vysílání, která přetrvávají i po skončení vysílání. Škodlivé aplikace mohou tablet zpomalit či způsobit jeho nestabilitu, protože bude používat příliš mnoho paměti."</string>
     <string name="permdesc_broadcastSticky" product="default" msgid="1920045289234052219">"Umožňuje aplikaci odeslat trvalá vysílání, která přetrvávají i po skončení vysílání. Škodlivé aplikace mohou telefon zpomalit či způsobit jeho nestabilitu, protože bude používat příliš mnoho paměti."</string>
-    <string name="permlab_readContacts" msgid="6219652189510218240">"čtení dat kontaktů"</string>
+    <string name="permlab_readContacts" msgid="6219652189510218240">"číst data kontaktů"</string>
     <string name="permdesc_readContacts" product="tablet" msgid="7596158687301157686">"Umožňuje aplikaci načíst všechna data kontaktů (adresy) uložená v tabletu. Škodlivé aplikace toto oprávnění mohou zneužít a odeslat vaše data dalším lidem."</string>
     <string name="permdesc_readContacts" product="default" msgid="3371591512896545975">"Umožňuje aplikaci načíst všechna data kontaktů (adresy) uložená ve vašem telefonu. Škodlivé aplikace poté mohou dalším lidem odeslat vaše data."</string>
-    <string name="permlab_writeContacts" msgid="644616215860933284">"zápis dat kontaktů"</string>
+    <string name="permlab_writeContacts" msgid="644616215860933284">"zapisovat data kontaktů"</string>
     <string name="permdesc_writeContacts" product="tablet" msgid="7782689510038568495">"Umožňuje aplikaci změnit kontaktní údaje (adresu) uložené v tabletu. Škodlivé aplikace toto oprávnění mohou zneužít a vymazat či pozměnit kontaktní údaje."</string>
     <string name="permdesc_writeContacts" product="default" msgid="3924383579108183601">"Umožňuje aplikaci změnit kontaktní údaje (adresu) uložené v telefonu. Škodlivé aplikace mohou pomocí tohoto nastavení vymazat či pozměnit kontaktní údaje."</string>
     <string name="permlab_readProfile" msgid="6824681438529842282">"číst údaje o vašem profilu"</string>
@@ -700,7 +700,7 @@
     <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Zapnout zvuk"</string>
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Vypnout zvuk"</string>
     <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Bezpečnostní gesto zahájeno"</string>
-    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Bzpečnostní gesto vymazáno"</string>
+    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Bezpečnostní gesto vymazáno"</string>
     <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Buňka přidána"</string>
     <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Bezpečnostní gesto dokončeno"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 4e98da8..56b24bb 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -215,7 +215,7 @@
     <string name="permlab_setDebugApp" msgid="4339730312925176742">"aktiver programfejlretning"</string>
     <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Tillader, at en applikation slår fejlretning af en anden applikation til. Ondsindede applikationer kan bruge dette til at standse andre applikationer."</string>
     <string name="permlab_changeConfiguration" msgid="8214475779521218295">"skift indstillinger for brugergrænsefladen"</string>
-    <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Tillader, at en applikation ændrer den nuværende konfiguration, f.eks. den lokale eller overordnede skrifttypestørrelse."</string>
+    <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Tillader, at en applikation ændrer den nuværende konfiguration, f.eks. den lokale eller overordnede skriftstørrelse."</string>
     <string name="permlab_enableCarMode" msgid="5684504058192921098">"aktivere biltilstand"</string>
     <string name="permdesc_enableCarMode" msgid="5673461159384850628">"Tillader en applikation at aktivere biltilstand."</string>
     <string name="permlab_killBackgroundProcesses" msgid="8373714752793061963">"standse baggrundsprocesser"</string>
@@ -668,7 +668,7 @@
     <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"Knap til forrige nummer"</string>
     <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"Knap til næste nummer"</string>
     <string name="lockscreen_transport_pause_description" msgid="7659088786780128001">"Pause-knap"</string>
-    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Afspil-knappen"</string>
+    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Afspil-knap"</string>
     <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Stop-knap"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"Kun nødopkald"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Netværket er låst"</string>
@@ -986,7 +986,7 @@
     <string name="usb_storage_title" msgid="5901459041398751495">"USB er tilsluttet"</string>
     <string name="usb_storage_message" product="nosdcard" msgid="6631094834151575841">"Du har fået forbindelse til din computer via USB. Vælg knappen nedenfor, hvis du vil kopiere filer mellem din computer og din Androids USB-lager."</string>
     <string name="usb_storage_message" product="default" msgid="4510858346516069238">"Du har fået forbindelse til din computer via USB. Vælg knappen nedenfor, hvis du ønsker at kopiere filer mellem din computer og din Androids SD-kort."</string>
-    <string name="usb_storage_button_mount" msgid="1052259930369508235">"Slå USB-lagringen til"</string>
+    <string name="usb_storage_button_mount" msgid="1052259930369508235">"Slå USB-lagring til"</string>
     <string name="usb_storage_error_message" product="nosdcard" msgid="3276413764430468454">"Der opstod et problem med at bruge USB-lager til USB-masselager."</string>
     <string name="usb_storage_error_message" product="default" msgid="120810397713773275">"Der opstod et problem med at bruge dit SD-kort til USB-masselager."</string>
     <string name="usb_storage_notification_title" msgid="8175892554757216525">"USB er tilsluttet"</string>
@@ -999,7 +999,7 @@
     <string name="usb_storage_stop_button_mount" msgid="7060218034900696029">"Slå USB-lagring fra"</string>
     <string name="usb_storage_stop_error_message" msgid="143881914840412108">"Der opstod et problem med at slå USB-lagringen fra. Sørg for, at du har demonteret USB-værten, og prøv så igen."</string>
     <string name="dlg_confirm_kill_storage_users_title" msgid="963039033470478697">"Slå USB-lagring til"</string>
-    <string name="dlg_confirm_kill_storage_users_text" msgid="3202838234780505886">"Hvis du slår USB-lagring til, vil nogle af de applikationer, som du bruger, stoppe, og de kan være utilgængelige, indtil du slår USB-lagring til igen."</string>
+    <string name="dlg_confirm_kill_storage_users_text" msgid="3202838234780505886">"Hvis du slår USB-lagring til, vil nogle af de applikationer, du bruger, stoppe, og de kan være utilgængelige, indtil du slår USB-lagring fra igen."</string>
     <string name="dlg_error_title" msgid="7323658469626514207">"USB-handlingen mislykkedes"</string>
     <string name="dlg_ok" msgid="7376953167039865701">"OK"</string>
     <string name="usb_mtp_notification_title" msgid="3699913097391550394">"Tilsluttet som en medieenhed"</string>
@@ -1009,7 +1009,7 @@
     <string name="usb_notification_message" msgid="4447869605109736382">"Tryk for at se andre valgmuligheder for USB-tilslutning"</string>
     <string name="extmedia_format_title" product="nosdcard" msgid="7980995592595097841">"Formater USB-lager"</string>
     <string name="extmedia_format_title" product="default" msgid="8663247929551095854">"Formater SD-kort"</string>
-    <string name="extmedia_format_message" product="nosdcard" msgid="8296908079722897772">"Vil du formatere USB-lager og slette alle filer, som er gemt der? Handlingen kan ikke fortrydes!"</string>
+    <string name="extmedia_format_message" product="nosdcard" msgid="8296908079722897772">"Vil du formatere USB-lageret og slette alle filer, som er gemt der? Handlingen kan ikke fortrydes!"</string>
     <string name="extmedia_format_message" product="default" msgid="3621369962433523619">"Er du sikker på, du ønsker at formatere SD-kortet? Alle data på kortet mistes."</string>
     <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formater"</string>
     <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-fejlretning er tilsluttet"</string>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index 2df9779..cfb6742 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -668,7 +668,7 @@
     <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"Botón para pista anterior"</string>
     <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"Botón para pista siguiente"</string>
     <string name="lockscreen_transport_pause_description" msgid="7659088786780128001">"Botón Pausa"</string>
-    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Botón Reproducir."</string>
+    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Botón Reproducir"</string>
     <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Botón Detener"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"Sólo llamadas de emergencia"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Red bloqueada"</string>
@@ -701,7 +701,7 @@
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Sonido apagado"</string>
     <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Se inició el patrón"</string>
     <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Se borró el patrón"</string>
-    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Se agregó un celular"</string>
+    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Se agregó una celda."</string>
     <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Se completó el patrón"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index eced66b..1743091 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -902,7 +902,7 @@
     <string name="anr_activity_process" msgid="7018289416670457797">"La actividad <xliff:g id="ACTIVITY">%1$s</xliff:g> no responde."\n\n"¿Quieres cerrarla?"</string>
     <string name="anr_application_process" msgid="7208175830253210526">"La aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> no responde. ¿Quieres cerrarla?"</string>
     <string name="anr_process" msgid="306819947562555821">"El proceso <xliff:g id="PROCESS">%1$s</xliff:g> no responde."\n\n"¿Quieres cerrarlo?"</string>
-    <string name="force_close" msgid="8346072094521265605">"ACEPTAR"</string>
+    <string name="force_close" msgid="8346072094521265605">"Aceptar"</string>
     <string name="report" msgid="4060218260984795706">"Informar"</string>
     <string name="wait" msgid="7147118217226317732">"Esperar"</string>
     <string name="launch_warning_title" msgid="8323761616052121936">"Aplicación redireccionada"</string>
@@ -1206,7 +1206,7 @@
     <string name="fingerprints" msgid="4516019619850763049">"Huellas digitales:"</string>
     <string name="sha256_fingerprint" msgid="4391271286477279263">"Huella digital SHA-256:"</string>
     <string name="sha1_fingerprint" msgid="7930330235269404581">"Huella digital SHA-1:"</string>
-    <string name="activity_chooser_view_see_all" msgid="180268188117163072">"Ver todas..."</string>
+    <string name="activity_chooser_view_see_all" msgid="180268188117163072">"Ver todo..."</string>
     <string name="activity_chooser_view_dialog_title_default" msgid="3325054276356556835">"Seleccionar actividad"</string>
     <string name="share_action_provider_share_with" msgid="1791316789651185229">"Compartir con..."</string>
     <string name="status_bar_device_locked" msgid="3092703448690669768">"Dispositivo bloqueado"</string>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 2839734..a526c2e 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -983,19 +983,19 @@
     <string name="perms_hide" msgid="7283915391320676226"><b>"Masquer"</b></string>
     <string name="perms_show_all" msgid="2671791163933091180"><b>"Tout afficher"</b></string>
     <string name="usb_storage_activity_title" msgid="2399289999608900443">"Stockage de masse USB"</string>
-    <string name="usb_storage_title" msgid="5901459041398751495">"Connecté à l\'aide d\'un câble USB"</string>
+    <string name="usb_storage_title" msgid="5901459041398751495">"Connecté par USB"</string>
     <string name="usb_storage_message" product="nosdcard" msgid="6631094834151575841">"Vous êtes connecté à votre ordinateur via un câble USB. Appuyez sur le bouton ci-dessous pour copier des fichiers de votre ordinateur vers la mémoire de stockage USB de votre Android, ou inversement."</string>
     <string name="usb_storage_message" product="default" msgid="4510858346516069238">"Vous êtes connecté à votre ordinateur via un câble USB. Appuyez sur le bouton ci-dessous pour copier des fichiers de votre ordinateur vers la carte SD de votre Android, ou inversement."</string>
     <string name="usb_storage_button_mount" msgid="1052259930369508235">"Activer la mémoire de stockage USB"</string>
     <string name="usb_storage_error_message" product="nosdcard" msgid="3276413764430468454">"Un problème est survenu lors de l\'utilisation de votre mémoire de stockage USB comme mémoire de stockage de masse."</string>
     <string name="usb_storage_error_message" product="default" msgid="120810397713773275">"Un problème est survenu lors de l\'utilisation de votre carte SD comme mémoire de stockage de masse USB."</string>
-    <string name="usb_storage_notification_title" msgid="8175892554757216525">"Connecté avec un câble USB"</string>
+    <string name="usb_storage_notification_title" msgid="8175892554757216525">"Connecté par USB"</string>
     <string name="usb_storage_notification_message" msgid="7380082404288219341">"Activez pour copier des fichiers vers/de votre ordinateur."</string>
     <string name="usb_storage_stop_notification_title" msgid="2336058396663516017">"Désactiver la mémoire de stockage USB"</string>
     <string name="usb_storage_stop_notification_message" msgid="2591813490269841539">"Sélectionner pour désactiver la mémoire de stockage USB"</string>
-    <string name="usb_storage_stop_title" msgid="660129851708775853">"Mémoire de stockage USB en cours d\'utilisation"</string>
+    <string name="usb_storage_stop_title" msgid="660129851708775853">"Mémoire de stockage USB activée"</string>
     <string name="usb_storage_stop_message" product="nosdcard" msgid="1368842269463745067">"Avant de désactiver la mémoire de stockage USB, assurez-vous d\'avoir désinstallé (\"éjecté\") de votre ordinateur la mémoire de stockage USB de votre Android."</string>
-    <string name="usb_storage_stop_message" product="default" msgid="3613713396426604104">"Avant de désactiver la mémoire de stockage USB, assurez-vous d\'avoir désinstallé (\"éjecté\") de votre ordinateur la carte SD de votre Android."</string>
+    <string name="usb_storage_stop_message" product="default" msgid="3613713396426604104">"Avant de désactiver la mémoire de stockage USB, assurez-vous d\'avoir désinstallé (\"éjecté\") la carte SD de votre Android depuis votre ordinateur."</string>
     <string name="usb_storage_stop_button_mount" msgid="7060218034900696029">"Désactiver la mémoire de stockage USB"</string>
     <string name="usb_storage_stop_error_message" msgid="143881914840412108">"Un problème est survenu lors de la désactivation de la mémoire de stockage USB. Assurez-vous que l\'hôte USB a bien été désinstallé, puis réessayez."</string>
     <string name="dlg_confirm_kill_storage_users_title" msgid="963039033470478697">"Activer la mémoire de stockage USB"</string>
@@ -1012,7 +1012,7 @@
     <string name="extmedia_format_message" product="nosdcard" msgid="8296908079722897772">"Formater la mémoire de stockage USB en effaçant tous les fichiers ? Cette action est irréversible."</string>
     <string name="extmedia_format_message" product="default" msgid="3621369962433523619">"Voulez-vous vraiment formater la carte SD ? Toutes les données de cette carte seront perdues."</string>
     <string name="extmedia_format_button_format" msgid="4131064560127478695">"Format"</string>
-    <string name="adb_active_notification_title" msgid="6729044778949189918">"Débogage USB connecté"</string>
+    <string name="adb_active_notification_title" msgid="6729044778949189918">"Débogage USB activé"</string>
     <string name="adb_active_notification_message" msgid="8470296818270110396">"Sélectionnez cette option pour désactiver le débogage USB."</string>
     <string name="select_input_method" msgid="6865512749462072765">"Sélectionner un mode de saisie"</string>
     <string name="configure_input_methods" msgid="6324843080254191535">"Configurer les modes de saisie"</string>
@@ -1103,7 +1103,7 @@
     <string name="format_error" product="nosdcard" msgid="6299769563624776948">"Impossible d\'effacer la mémoire de stockage USB."</string>
     <string name="format_error" product="default" msgid="7315248696644510935">"Impossible d\'effacer la carte SD."</string>
     <string name="media_bad_removal" msgid="7960864061016603281">"La carte SD a été retirée sans avoir été désinstallée."</string>
-    <string name="media_checking" product="nosdcard" msgid="418188720009569693">"Vérification de la mémoire de stockage USB en cours."</string>
+    <string name="media_checking" product="nosdcard" msgid="418188720009569693">"Vérification de la mémoire de stockage USB..."</string>
     <string name="media_checking" product="default" msgid="7334762503904827481">"Vérification de la carte SD en cours."</string>
     <string name="media_removed" msgid="7001526905057952097">"La carte SD a été retirée."</string>
     <string name="media_shared" product="nosdcard" msgid="5830814349250834225">"La mémoire de stockage USB est en cours d\'utilisation par l\'ordinateur."</string>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 62e753f..84d940d 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -665,16 +665,11 @@
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Umetnite SIM karticu."</string>
     <string name="lockscreen_missing_sim_instructions_long" msgid="7138450788301444298">"Nedostaje SIM kartica ili nije čitljiva. Umetnite SIM karticu."</string>
     <string name="lockscreen_permanent_disabled_sim_instructions" msgid="1631853574702335453">"Vaša SIM kartica trajno je onemogućena."\n"Obratite se svom pružatelju bežičnih usluga za dobivanje druge SIM kartice."</string>
-    <!-- no translation found for lockscreen_transport_prev_description (201594905152746886) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_next_description (6089297650481292363) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_pause_description (7659088786780128001) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_play_description (5888422938351019426) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_stop_description (4562318378766987601) -->
-    <skip />
+    <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"Gumb Prethodni zapis"</string>
+    <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"Gumb Sljedeći zapis"</string>
+    <string name="lockscreen_transport_pause_description" msgid="7659088786780128001">"Gumb Pauza"</string>
+    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Gumb Reprodukcija"</string>
+    <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Gumb Zaustavi"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"Samo hitni pozivi"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Mreža je zaključana"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM kartica je zaključana PUK-om."</string>
@@ -704,14 +699,10 @@
     <string name="lockscreen_unlock_label" msgid="737440483220667054">"Otključaj"</string>
     <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Zvuk je uključen"</string>
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Zvuk isključen"</string>
-    <!-- no translation found for lockscreen_access_pattern_start (3941045502933142847) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cleared (5583479721001639579) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cell_added (6756031208359292487) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_detected (4988730895554057058) -->
-    <skip />
+    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Uzorak se pokrenuo"</string>
+    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Uzorak je obrisan"</string>
+    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Dodan je mobitel"</string>
+    <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Uzorak je dovršen"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
     <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index 1f74260..5819e4e 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -665,16 +665,11 @@
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Masukkan kartu SIM"</string>
     <string name="lockscreen_missing_sim_instructions_long" msgid="7138450788301444298">"Kartu SIM tidak ada atau tidak dapat dibaca. Masukkan kartu SIM."</string>
     <string name="lockscreen_permanent_disabled_sim_instructions" msgid="1631853574702335453">"Kartu SIM Anda dinonaktifkan secara permanen."\n" Hubungi penyedia layanan nirkabel Anda untuk mendapatkan kartu SIM lainnya."</string>
-    <!-- no translation found for lockscreen_transport_prev_description (201594905152746886) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_next_description (6089297650481292363) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_pause_description (7659088786780128001) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_play_description (5888422938351019426) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_stop_description (4562318378766987601) -->
-    <skip />
+    <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"Tombol trek sebelumnya"</string>
+    <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"Tombol trek berikutnya"</string>
+    <string name="lockscreen_transport_pause_description" msgid="7659088786780128001">"Tombol jeda"</string>
+    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Tombol putar"</string>
+    <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Tombol hentikan"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"Panggilan darurat saja"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Jaringan terkunci"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Kartu SIM terkunci PUK."</string>
@@ -704,14 +699,10 @@
     <string name="lockscreen_unlock_label" msgid="737440483220667054">"Buka kunci"</string>
     <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Suara hidup"</string>
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Suara mati"</string>
-    <!-- no translation found for lockscreen_access_pattern_start (3941045502933142847) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cleared (5583479721001639579) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cell_added (6756031208359292487) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_detected (4988730895554057058) -->
-    <skip />
+    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Pola dimulai"</string>
+    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Pola dihapus"</string>
+    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Sel ditambahkan"</string>
+    <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Pola selesai"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
     <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index 9646d6a..b094b12 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -990,7 +990,7 @@
     <string name="usb_storage_error_message" product="nosdcard" msgid="3276413764430468454">"Problema di utilizzo dell\'archivio USB come archivio di massa USB."</string>
     <string name="usb_storage_error_message" product="default" msgid="120810397713773275">"Problema di utilizzo della scheda SD come archivio di massa USB."</string>
     <string name="usb_storage_notification_title" msgid="8175892554757216525">"USB collegata"</string>
-    <string name="usb_storage_notification_message" msgid="7380082404288219341">"Seleziona per copiare file sul/dal tuo computer."</string>
+    <string name="usb_storage_notification_message" msgid="7380082404288219341">"Seleziona per copiare file sul/dal computer."</string>
     <string name="usb_storage_stop_notification_title" msgid="2336058396663516017">"Disattiva archivio USB"</string>
     <string name="usb_storage_stop_notification_message" msgid="2591813490269841539">"Seleziona per disattivare l\'archivio USB."</string>
     <string name="usb_storage_stop_title" msgid="660129851708775853">"Archivio USB in uso"</string>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 9e6e8b8..2439bc1 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -665,16 +665,11 @@
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"SIMカードを挿入してください。"</string>
     <string name="lockscreen_missing_sim_instructions_long" msgid="7138450788301444298">"SIMカードが見つからないか読み取れません。SIMカードを挿入してください。"</string>
     <string name="lockscreen_permanent_disabled_sim_instructions" msgid="1631853574702335453">"お使いのSIMカードは永久に無効となっています。"\n"ワイヤレスサービスプロバイダに問い合わせて新しいSIMカードを入手してください。"</string>
-    <!-- no translation found for lockscreen_transport_prev_description (201594905152746886) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_next_description (6089297650481292363) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_pause_description (7659088786780128001) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_play_description (5888422938351019426) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_stop_description (4562318378766987601) -->
-    <skip />
+    <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"前のトラックボタン"</string>
+    <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"次のトラックボタン"</string>
+    <string name="lockscreen_transport_pause_description" msgid="7659088786780128001">"一時停止ボタン"</string>
+    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"再生ボタン"</string>
+    <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"停止ボタン"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"緊急通報のみ"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"ネットワークがロックされました"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIMカードはPUKでロックされています。"</string>
@@ -704,14 +699,10 @@
     <string name="lockscreen_unlock_label" msgid="737440483220667054">"ロック解除"</string>
     <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"サウンドON"</string>
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"サウンドOFF"</string>
-    <!-- no translation found for lockscreen_access_pattern_start (3941045502933142847) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cleared (5583479721001639579) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cell_added (6756031208359292487) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_detected (4988730895554057058) -->
-    <skip />
+    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"パターンの描画を開始しました"</string>
+    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"パターンを消去しました"</string>
+    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"セルを追加しました"</string>
+    <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"パターンの描画が完了しました"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
     <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index 95fbeeb..35e89a0 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -699,10 +699,10 @@
     <string name="lockscreen_unlock_label" msgid="737440483220667054">"잠금해제"</string>
     <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"사운드 켜기"</string>
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"사운드 끄기"</string>
-    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"패턴 시작됨"</string>
-    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"패턴 삭제됨"</string>
+    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"패턴 시작"</string>
+    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"패턴 삭제"</string>
     <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"셀 추가됨"</string>
-    <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"패턴 완료됨"</string>
+    <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"패턴 완료"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
     <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index 8ab8262..84be8cc 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -246,9 +246,9 @@
     <string name="permdesc_setAlwaysFinish" msgid="8773936403987091620">"Lar applikasjonen kontrollere om aktiviteter alltid avsluttes når de sendes til bakgrunnen. Behøves aldri for vanlige applikasjoner."</string>
     <string name="permlab_batteryStats" msgid="7863923071360031652">"endre batteristatistikk"</string>
     <string name="permdesc_batteryStats" msgid="5847319823772230560">"Lar applikasjonen endre på innsamlet batteristatistikk. Ikke ment for vanlige applikasjoner."</string>
-    <string name="permlab_backup" msgid="470013022865453920">"kontrollere backup og gjenoppretting"</string>
-    <string name="permdesc_backup" msgid="4837493065154256525">"Lar applikasjonen kontrollere systemets backup- og gjenopprettingsmekanisme. Ikke ment for vanlige applikasjoner."</string>
-    <string name="permlab_confirm_full_backup" msgid="5557071325804469102">"bekreft en fullstendig sikkerhetskopi, eller gjenopprett driften"</string>
+    <string name="permlab_backup" msgid="470013022865453920">"kontrollere sikkerhetskopiering og gjenoppretting"</string>
+    <string name="permdesc_backup" msgid="4837493065154256525">"Lar appen kontrollere systemets sikkerhetskopierings- og gjenopprettingsmekanisme. Ikke ment for vanlige apper."</string>
+    <string name="permlab_confirm_full_backup" msgid="5557071325804469102">"bekrefte en fullstendig sikkerhetskopi, eller gjenopprette driften"</string>
     <string name="permdesc_confirm_full_backup" msgid="9005017754175897954">"Lar appen starte det fullst. grensesnittet for bekreftelse av sikkerh.kopi. Må ikke brukes av noen apper."</string>
     <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"vis uautoriserte vinduer"</string>
     <string name="permdesc_internalSystemWindow" msgid="5895082268284998469">"Tillater at det opprettes vinduer ment for bruk av systemets interne brukergrensesnitt. Ikke ment for vanlige applikasjoner."</string>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index 0fcbd3f..23f7cb5 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -665,16 +665,11 @@
     <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Introduceţi un card SIM."</string>
     <string name="lockscreen_missing_sim_instructions_long" msgid="7138450788301444298">"Cartela SIM lipseşte sau nu poate fi citită. Introduceţi o cartelă SIM."</string>
     <string name="lockscreen_permanent_disabled_sim_instructions" msgid="1631853574702335453">"Cartela dvs. SIM este dezactivată definitiv."\n" Contactaţi furnizorul de servicii wireless pentru a obţine o altă cartelă SIM."</string>
-    <!-- no translation found for lockscreen_transport_prev_description (201594905152746886) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_next_description (6089297650481292363) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_pause_description (7659088786780128001) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_play_description (5888422938351019426) -->
-    <skip />
-    <!-- no translation found for lockscreen_transport_stop_description (4562318378766987601) -->
-    <skip />
+    <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"Butonul Melodia anterioară"</string>
+    <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"Butonul Melodia următoare"</string>
+    <string name="lockscreen_transport_pause_description" msgid="7659088786780128001">"Butonul Întrerupeţi"</string>
+    <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Butonul Redaţi"</string>
+    <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Butonul Opriţi"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"Numai apeluri de urgenţă"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Reţea blocată"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Cardul SIM este blocat cu codul PUK."</string>
@@ -704,14 +699,10 @@
     <string name="lockscreen_unlock_label" msgid="737440483220667054">"Deblocaţi"</string>
     <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sunet activat"</string>
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Sunet dezactivat"</string>
-    <!-- no translation found for lockscreen_access_pattern_start (3941045502933142847) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cleared (5583479721001639579) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_cell_added (6756031208359292487) -->
-    <skip />
-    <!-- no translation found for lockscreen_access_pattern_detected (4988730895554057058) -->
-    <skip />
+    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Desenarea modelului a început"</string>
+    <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Modelul a fost şters"</string>
+    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Celulă adăugată"</string>
+    <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Modelul a fost desenat"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
     <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
@@ -1178,7 +1169,7 @@
     <string name="description_target_camera" msgid="969071997552486814">"Cameră foto"</string>
     <string name="description_target_silent" msgid="893551287746522182">"Silenţios"</string>
     <string name="description_target_soundon" msgid="30052466675500172">"Sunet activat"</string>
-    <string name="keyboard_headset_required_to_hear_password" msgid="5913502399391940888">"Conectaţi un set de căşti pentru a auzi tastele apăsate la introducerea parolei rostite cu voce tare."</string>
+    <string name="keyboard_headset_required_to_hear_password" msgid="5913502399391940888">"Conectaţi un set căşti-microfon pentru a auzi tastele apăsate când introduceţi parola."</string>
     <string name="keyboard_password_character_no_headset" msgid="2859873770886153678">"Punct."</string>
     <string name="action_bar_home_description" msgid="5293600496601490216">"Navigaţi la ecranul de pornire"</string>
     <string name="action_bar_up_description" msgid="2237496562952152589">"Navigaţi în sus"</string>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 0541edf..697f082 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -669,7 +669,7 @@
     <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"Кнопка перехода к следующему треку"</string>
     <string name="lockscreen_transport_pause_description" msgid="7659088786780128001">"Кнопка паузы"</string>
     <string name="lockscreen_transport_play_description" msgid="5888422938351019426">"Кнопка воспроизведения"</string>
-    <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Кнопка остановки"</string>
+    <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Кнопка выключения"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"Только экстренные вызовы"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Сеть заблокирована"</string>
     <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-карта заблокирована с помощью кода PUK."</string>
@@ -699,7 +699,7 @@
     <string name="lockscreen_unlock_label" msgid="737440483220667054">"Разблокировать"</string>
     <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Вкл. звук"</string>
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Откл. звук"</string>
-    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Ввод графического ключа начался"</string>
+    <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Ввод графического ключа"</string>
     <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Графический ключ сброшен"</string>
     <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Ячейка добавлена"</string>
     <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Графический ключ введен"</string>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index d559569..3337f95 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -701,7 +701,7 @@
     <string name="lockscreen_sound_off_label" msgid="996822825154319026">"关闭声音"</string>
     <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"开始绘制图案"</string>
     <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"图案已清除"</string>
-    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"单元格已添加"</string>
+    <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"已添加单元格"</string>
     <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"图案绘制完成"</string>
     <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
     <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd
index 59675a8..6a99d35 100644
--- a/docs/html/sdk/eclipse-adt.jd
+++ b/docs/html/sdk/eclipse-adt.jd
@@ -67,7 +67,7 @@
 the ADT Plugin, as denoted by revision number. </p>
 
 <p>For a summary of all known issues in ADT, see <a
-href="http://tools.android.com/release/knownissues">http://tools.android.com/release/knownissues</a>.</p>
+href="http://tools.android.com/knownissues">http://tools.android.com/knownissues</a>.</p>
 
 <script type="text/javascript">
 function toggleDiv(link) {
diff --git a/docs/html/sdk/tools-notes.jd b/docs/html/sdk/tools-notes.jd
index f5b61ee..272efcb 100644
--- a/docs/html/sdk/tools-notes.jd
+++ b/docs/html/sdk/tools-notes.jd
@@ -24,7 +24,7 @@
 and AVD Manager. </p>
 
 <p>For a summary of all known issues in SDK Tools, see <a
-href="http://tools.android.com/release/knownissues">http://tools.android.com/release/knownissues</a>.</p>
+href="http://tools.android.com/knownissues">http://tools.android.com/knownissues</a>.</p>
 
 <script type="text/javascript">
 function toggleDiv(link) {
diff --git a/packages/BackupRestoreConfirmation/res/values-bg/strings.xml b/packages/BackupRestoreConfirmation/res/values-bg/strings.xml
index 914750a..a431bf7 100644
--- a/packages/BackupRestoreConfirmation/res/values-bg/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-bg/strings.xml
@@ -25,10 +25,8 @@
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Възстановяване на данните ми"</string>
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Без възстановяване"</string>
     <string name="current_password_text" msgid="8268189555578298067">"Моля, въведете текущата си парола за резервно копие по-долу:"</string>
-    <!-- no translation found for device_encryption_restore_text (1570864916855208992) -->
-    <skip />
-    <!-- no translation found for device_encryption_backup_text (5866590762672844664) -->
-    <skip />
+    <string name="device_encryption_restore_text" msgid="1570864916855208992">"Моля, въведете паролата си за шифроване на устройството по-долу."</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Моля, въведете паролата си за шифроване на устройството по-долу. Тя ще се използва и за шифроване на резервното копие на архива."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Моля, въведете парола, която да използвате за шифроване на пълното резервно копие на данните. Ако не е попълнена, ще бъде използвана текущата ви парола за резервно копие:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Ако искате да шифровате пълното резервно копие на данните, въведете парола по-долу:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Ако възстановените данни са шифровани, моля, въведете паролата по-долу:"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-de/strings.xml b/packages/BackupRestoreConfirmation/res/values-de/strings.xml
index 7a19b2e..a8f2d13 100644
--- a/packages/BackupRestoreConfirmation/res/values-de/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-de/strings.xml
@@ -26,7 +26,7 @@
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Nicht wiederherstellen"</string>
     <string name="current_password_text" msgid="8268189555578298067">"Geben Sie Ihr aktuelles Sicherungspasswort unten ein:"</string>
     <string name="device_encryption_restore_text" msgid="1570864916855208992">"Geben Sie Ihr Passwort zur Geräteverschlüsselung unten ein."</string>
-    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Geben Sie Ihr Passwort zur Geräteverschlüsselung unten ein. Damit wird ebenfalls das Sicherungsarchiv verschlüsselt."</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Geben Sie Ihr Passwort zur Geräteverschlüsselung unten ein. Damit wird auch das Sicherungsarchiv verschlüsselt."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Geben Sie ein Passwort für die Verschlüsselung der vollständigen Sicherungsdaten ein. Wenn Sie dieses Feld leer lassen, wird Ihr aktuelles Sicherungspasswort verwendet:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Wenn Sie die gesamten Sicherungsdaten verschlüsseln möchten, geben Sie unten ein Passwort ein:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Geben Sie das Passwort unten ein, wenn die Daten für die Wiederherstellung verschlüsselt sind:"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-es-rUS/strings.xml b/packages/BackupRestoreConfirmation/res/values-es-rUS/strings.xml
index 7a732df..21afa31 100644
--- a/packages/BackupRestoreConfirmation/res/values-es-rUS/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-es-rUS/strings.xml
@@ -26,7 +26,7 @@
     <string name="deny_restore_button_label" msgid="1724367334453104378">"No restaurar"</string>
     <string name="current_password_text" msgid="8268189555578298067">"Introduce tu contraseña actual de copia de seguridad a continuación:"</string>
     <string name="device_encryption_restore_text" msgid="1570864916855208992">"Introduce tu contraseña de encriptación del dispositivo a continuación:"</string>
-    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Introduce tu contraseña de encriptación del dispositivo a continuación. Esto también se utilizará para encriptar la copia de seguridad."</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Introduce tu contraseña de encriptación del dispositivo a continuación. Esta contraseña también se utilizará para encriptar la copia de seguridad."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Introduce una contraseña para encriptar los datos de la copia de seguridad completa. Si dejas este campo en blanco, se utilizará tu contraseña actual de copia de seguridad:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Si deseas encriptar los datos de la copia de seguridad completa, introduce una contraseña a continuación:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Si los datos de recuperación están encriptados, vuelve a introducir la contraseña a continuación:"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-hr/strings.xml b/packages/BackupRestoreConfirmation/res/values-hr/strings.xml
index 0c4cfd9..c5c4ce9 100644
--- a/packages/BackupRestoreConfirmation/res/values-hr/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-hr/strings.xml
@@ -25,10 +25,8 @@
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Vrati moje podatke"</string>
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Ne vraćaj"</string>
     <string name="current_password_text" msgid="8268189555578298067">"U nastavku unesite trenutačnu zaporku za sigurnosnu kopiju:"</string>
-    <!-- no translation found for device_encryption_restore_text (1570864916855208992) -->
-    <skip />
-    <!-- no translation found for device_encryption_backup_text (5866590762672844664) -->
-    <skip />
+    <string name="device_encryption_restore_text" msgid="1570864916855208992">"U nastavku unesite svoju zaporku za enkripciju uređaja."</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"U nastavku unesite svoju zaporku enkripcije za uređaj. Ona će se upotrijebiti i za enkripciju te za arhivu sigurnosnih kopija."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Unesite zaporku koju ćete upotrebljavati za kriptiranje podataka potpune sigurnosne kopije. Ako je ostavite praznom, bit će upotrijebljena vaša trenutačna zaporka za sigurnosno kopiranje:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Ako želite kriptirati podatke potpune sigurnosne kopije, u nastavku unesite zaporku:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Ako su podaci za vraćanje kriptirani, unesite zaporku u nastavku:"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-in/strings.xml b/packages/BackupRestoreConfirmation/res/values-in/strings.xml
index 65196bd..3fb6d6b 100644
--- a/packages/BackupRestoreConfirmation/res/values-in/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-in/strings.xml
@@ -25,10 +25,8 @@
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Memulihkan data saya"</string>
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Jangan pulihkan"</string>
     <string name="current_password_text" msgid="8268189555578298067">"Masukkan sandi cadangan Anda saat ini di bawah:"</string>
-    <!-- no translation found for device_encryption_restore_text (1570864916855208992) -->
-    <skip />
-    <!-- no translation found for device_encryption_backup_text (5866590762672844664) -->
-    <skip />
+    <string name="device_encryption_restore_text" msgid="1570864916855208992">"Masukkan sandi enkripsi perangkat Anda di bawah."</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Masukkan sandi enkripsi perangkat Anda di bawah. Sandi ini juga akan digunakan untuk mengenkripsi arsip cadangan."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Masukkan sandi yang digunakan untuk mengenkripsi data cadangan lengkap. Jika bidang ini dikosongkan, sandi cadangan Anda saat ini akan digunakan:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Jika Anda ingin mengenkripsi data cadangan lengkap, masukkan sandi di bawah:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Jika data pemulihan dienkripsi, masukkan sandi di bawah:"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-ja/strings.xml b/packages/BackupRestoreConfirmation/res/values-ja/strings.xml
index 5ddcc22..98916c5 100644
--- a/packages/BackupRestoreConfirmation/res/values-ja/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ja/strings.xml
@@ -25,10 +25,8 @@
     <string name="allow_restore_button_label" msgid="3081286752277127827">"データを復元する"</string>
     <string name="deny_restore_button_label" msgid="1724367334453104378">"復元しない"</string>
     <string name="current_password_text" msgid="8268189555578298067">"以下に現在のバックアップ用のパスワードを入力してください:"</string>
-    <!-- no translation found for device_encryption_restore_text (1570864916855208992) -->
-    <skip />
-    <!-- no translation found for device_encryption_backup_text (5866590762672844664) -->
-    <skip />
+    <string name="device_encryption_restore_text" msgid="1570864916855208992">"以下に端末暗号化用のパスワードを入力してください。"</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"以下に端末暗号化用のパスワードを入力してください。このパスワードはバックアップアーカイブの暗号化にも使用します。"</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"フルバックアップデータの暗号化に使用するパスワードを入力してください。空白のままにした場合、現在のバックアップ用のパスワードが使用されます:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"フルバックアップのデータを暗号化する場合は、以下にパスワードを入力してください:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"復元するデータが暗号化されている場合、以下にパスワードを入力してください:"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-nb/strings.xml b/packages/BackupRestoreConfirmation/res/values-nb/strings.xml
index a04d90d..a93c081 100644
--- a/packages/BackupRestoreConfirmation/res/values-nb/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-nb/strings.xml
@@ -18,10 +18,10 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="backup_confirm_title" msgid="827563724209303345">"Fullstendig sikkerhetskopi"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"Fullstendig gjenoppretting"</string>
-    <string name="backup_confirm_text" msgid="1878021282758896593">"En full sikkerhetskopi av alle dataene til en tilkoblet stasjonær datamaskin er forespurt. Vil du tillate dette?"\n\n"Hvis du ikke har bedt om sikkerhetskopieringen selv, må du ikke tillate at operasjonen fortsetter."</string>
+    <string name="backup_confirm_text" msgid="1878021282758896593">"En full sikkerhetskopi av alle dataene til en tilkoblet datamaskin er forespurt. Vil du tillate dette?"\n\n"Hvis du ikke har bedt om sikkerhetskopieringen selv, må du ikke tillate at operasjonen fortsetter."</string>
     <string name="allow_backup_button_label" msgid="4217228747769644068">"Sikkerhetskopier dataene mine"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"Ikke sikkerhetskopiér"</string>
-    <string name="restore_confirm_text" msgid="7499866728030461776">"En full gjenoppretting av alle data fra en tilkoblet stasjonær datamaskin er forespurt. Vil du tillate dette?"\n\n"Hvis du ikke har bedt om gjenopprettingen selv, må du ikke la operasjonen fortsette. Handlingen vil erstatte alle dataene som ligger på enheten!"</string>
+    <string name="restore_confirm_text" msgid="7499866728030461776">"En full gjenoppretting av alle data fra en tilkoblet datamaskin er forespurt. Vil du tillate dette?"\n\n"Hvis du ikke har bedt om gjenopprettingen selv, må du ikke la operasjonen fortsette. Handlingen vil erstatte alle dataene som ligger på enheten!"</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Gjenopprett dataene mine"</string>
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Ikke gjenopprett"</string>
     <string name="current_password_text" msgid="8268189555578298067">"Skriv inn ditt nåværende passord for sikkerhetskopiering nedenfor:"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
index 82cdfaf..4c49bf8 100644
--- a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
@@ -25,10 +25,8 @@
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Restabiliţi datele dvs."</string>
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Nu restabiliţi"</string>
     <string name="current_password_text" msgid="8268189555578298067">"Introduceţi mai jos parola actuală pentru copia de rezervă:"</string>
-    <!-- no translation found for device_encryption_restore_text (1570864916855208992) -->
-    <skip />
-    <!-- no translation found for device_encryption_backup_text (5866590762672844664) -->
-    <skip />
+    <string name="device_encryption_restore_text" msgid="1570864916855208992">"Introduceţi mai jos parola pentru criptarea dispozitivului."</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Introduceţi mai jos parola de criptare a dispozitivului. Aceasta va fi utilizată, de asemenea, pentru a cripta arhiva copiei de rezervă."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Introduceţi o parolă pentru a o utiliza la criptarea datelor copiei de rezervă complete. Dacă acest câmp rămâne necompletat, pentru copierea de rezervă se va utiliza parola dvs. actuală."</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Dacă doriţi să criptaţi datele copiei de rezervă complete, introduceţi o parolă mai jos:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Dacă datele pentru restabilire sunt criptate, introduceţi parola mai jos:"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-ru/strings.xml b/packages/BackupRestoreConfirmation/res/values-ru/strings.xml
index 2ce3ff6..98b8bfc 100644
--- a/packages/BackupRestoreConfirmation/res/values-ru/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ru/strings.xml
@@ -26,7 +26,7 @@
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Не восстанавливать"</string>
     <string name="current_password_text" msgid="8268189555578298067">"Введите пароль для резервного копирования:"</string>
     <string name="device_encryption_restore_text" msgid="1570864916855208992">"Введите пароль для шифрования устройства."</string>
-    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Введите пароль для шифрования устройства, а также архива резервных копий."</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Введите пароль для шифрования устройства и архива резервных копий."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Введите пароль для шифрования всех резервных данных. Если поле останется пустым, будет использован текущий пароль:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Чтобы зашифровать все резервные данные, введите пароль:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Если восстановленные данные зашифрованы, введите пароль:"</string>
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index cde7613..bb8697e 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Strek om skerm te vul"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Versoenbaarheid-zoem"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"As \'n program vir \'n kleiner skerm ontwerp is, sal \'n zoemkontrole naby die horlosie verskyn"</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB-lêeroordrag-opsies"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Heg as \'n mediaspeler (MTP)"</string>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index e7a19cc..aed83dd 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -62,20 +62,13 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"ማያ ለመሙለት ሳብ"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"የተኳኋኝነት አጉላ"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"ትግበራ ለትንሽ ማያ ሲነደፍ፣ የአጉላ መቆመጣጠሪያ በሰዓት በኩል ብቅ ይላል።"</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
-    <skip />
+    <!-- outdated translation 3808900131607378535 -->     <string name="screenshot_saving_ticker" msgid="7403652894056693515">"በማስቀመጥ ላይ..."</string>
+    <!-- outdated translation 7158814134399651627 -->     <string name="screenshot_saving_title" msgid="8242282144535555697">"ቅጽበታዊ ገጽ እይታ በማስቀመጥ ላይ..."</string>
+    <!-- outdated translation 7138808001579871654 -->     <string name="screenshot_saving_text" msgid="2419718443411738818">"ቅጽበታዊ ገጽ እይታ እስኪቀመጥ እባክህ ጠብቅ"</string>
+    <!-- outdated translation 1656379291643543172 -->     <string name="screenshot_saved_title" msgid="6461865960961414961">"ቅጽበታዊ ገጽ እይታ ተቀርጿል"</string>
+    <!-- outdated translation 5040360894749163221 -->     <string name="screenshot_saved_text" msgid="1152839647677558815">"ያንተን ቅጽበታዊ ገጽ እይታ ለማየት ንካ"</string>
+    <!-- outdated translation 1140968728869009679 -->     <string name="screenshot_failed_title" msgid="705781116746922771">"ቅጽበታዊ ገጽ እይታ አልተሳካም"</string>
+    <!-- outdated translation 9163506496592455352 -->     <string name="screenshot_failed_text" msgid="8134011269572415402">"ቅጽበታዊ ገጽ እይታ ማስቀመጥ አልተቻለም። ውጫዊ ማከማቻ አገልግሎት ላይ ሊሆን ይችላል።"</string>
     <string name="usb_preference_title" msgid="6551050377388882787">"የUSB ፋይል ሰደዳ አማራጮች"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"እንደ ማህደረ አጫዋች (MTP) ሰካ"</string>
     <string name="use_ptp_button_title" msgid="7517127540301625751">"እንደ ካሜራ (PTP) ሰካ"</string>
@@ -128,8 +121,7 @@
     <string name="accessibility_tty_enabled" msgid="4613200365379426561">"TeleTypewriter ነቅቷል።"</string>
     <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"የስልክ ጥሪ ይንዘር።"</string>
     <string name="accessibility_ringer_silent" msgid="9061243307939135383">"የስልክ ጥሪ ፀጥታ።"</string>
-    <!-- no translation found for accessibility_recents_item_dismissed (6803574935084867070) -->
-    <skip />
+    <string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"<xliff:g id="APP">%s</xliff:g> ተሰናብቷል::"</string>
     <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G ውሂብ ቦዝኗል"</string>
     <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G ውሂብ ቦዝኗል"</string>
     <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"የተንቀሳቃሽ ውሂብ ቦዝኗል"</string>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index 8c35ba7..00c8bf8 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"توسيع بملء الشاشة"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"تكبير/تصغير التوافق"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"عند تصميم تطبيق لشاشة أصغر، سيظهر عنصر تحكم في التكبير/التصغير بجوار الساعة."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"خيارات نقل الملفات عبر USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"تحميل كمشغل وسائط (MTP)"</string>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index 1b5244e..f349d33 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Разпъване – запълва екрана"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Промяна на мащаба за съвместимост"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Когато дадено приложение е създадено за по-малък екран, до часовника ще се покаже управление за промяна на мащаба."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Опции за пренос на файлове чрез USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Свързване като медиен плейър (MTP)"</string>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index c9bda33..b798318 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Estira per omplir pant."</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom de compatibilitat"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Quan una aplicació s\'hagi dissenyat per a una pantalla més petita, apareixerà un control de zoom al costat del rellotge."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Opcions transf. fitxers USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Munta com a reproductor multimèdia (MTP)"</string>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index 1ae0071..78d9d27 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Na celou obrazovku"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Kompatibilní přiblížení"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Pokud je aplikace navržena pro menší obrazovku, zobrazí se vedle hodin ovládací prvek přiblížení."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Možnosti přenosu souborů pomocí rozhraní USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Připojit jako přehrávač médií (MTP)"</string>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index f1704b1..9d27c30 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Stræk til fuld skærm"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Kompatibilitetszoom"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Når en app er udviklet til en mindre skærm, vises der en zoomfunktion ved uret."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Muligheder for USB-filoverførsel"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Isæt som en medieafspiller (MTP)"</string>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index e5d23ad..19c8500 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Auf Bildschirmgröße anpassen"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Kompatibilitätszoom"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Wenn eine App für einen kleineren Bildschirm ausgelegt ist, wird ein Zoom-Steuerelement neben der Uhr angezeigt."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB-Dateiübertragungsoptionen"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Als Medienplayer (MTP) bereitstellen"</string>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index aca9004..8e31690 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Προβoλή σε πλήρη οθ."</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Ζουμ για συμβατότητα"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Όταν μια εφαρμογή έχει σχεδιαστεί για προβολή σε μικρότερη οθόνη, δίπλα από το ρολόι θα εμφανιστεί ένα στοιχείο ελέγχου ζουμ."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Επιλογές μεταφοράς αρχείων μέσω USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Προσάρτηση ως μονάδας αναπαραγωγής μέσων (MTP)"</string>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index d8b0408..53e298b 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -62,20 +62,13 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Stretch to fill screen"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Compatibility Zoom"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"When an app was designed for a smaller screen, a zoom control will appear by the clock."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
-    <skip />
+    <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Saving screenshot…"</string>
+    <string name="screenshot_saving_title" msgid="8242282144535555697">"Saving screenshot…"</string>
+    <string name="screenshot_saving_text" msgid="2419718443411738818">"Screenshot is being saved."</string>
+    <string name="screenshot_saved_title" msgid="6461865960961414961">"Screenshot captured."</string>
+    <string name="screenshot_saved_text" msgid="1152839647677558815">"Touch to view your screenshot."</string>
+    <string name="screenshot_failed_title" msgid="705781116746922771">"Couldn\'t capture screenshot."</string>
+    <string name="screenshot_failed_text" msgid="8134011269572415402">"Couldn\'t save screenshot. Storage may be in use."</string>
     <string name="usb_preference_title" msgid="6551050377388882787">"USB file transfer options"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Mount as a media player (MTP)"</string>
     <string name="use_ptp_button_title" msgid="7517127540301625751">"Mount as a camera (PTP)"</string>
@@ -128,8 +121,7 @@
     <string name="accessibility_tty_enabled" msgid="4613200365379426561">"TeleTypewriter enabled."</string>
     <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"Ringer vibrate."</string>
     <string name="accessibility_ringer_silent" msgid="9061243307939135383">"Ringer silent."</string>
-    <!-- no translation found for accessibility_recents_item_dismissed (6803574935084867070) -->
-    <skip />
+    <string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"<xliff:g id="APP">%s</xliff:g> dismissed."</string>
     <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G data disabled"</string>
     <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G data disabled"</string>
     <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobile data disabled"</string>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index b21a1c7..098b6f6 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Estirar p/ ocupar la pantalla"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom de compatibilidad"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Cuando una aplicación fue diseñada para una pantalla más pequeña, aparece un control de zoom junto al reloj."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Opciones de transferencia de archivos por USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Activar como reproductor de medios (MTP)"</string>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index 367791a..258d53e 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -62,20 +62,13 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Expandir para ajustar"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom de compatibilidad"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Si la aplicación se ha diseñado para una pantalla más pequeña, aparecerá un control de zoom junto al reloj."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
-    <skip />
+    <!-- outdated translation 3808900131607378535 -->     <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Guardando..."</string>
+    <!-- outdated translation 7158814134399651627 -->     <string name="screenshot_saving_title" msgid="8242282144535555697">"Guardando captura de pantalla..."</string>
+    <!-- outdated translation 7138808001579871654 -->     <string name="screenshot_saving_text" msgid="2419718443411738818">"Espera a que se guarde la captura de pantalla."</string>
+    <!-- outdated translation 1656379291643543172 -->     <string name="screenshot_saved_title" msgid="6461865960961414961">"Captura de pantalla guardada"</string>
+    <!-- outdated translation 5040360894749163221 -->     <string name="screenshot_saved_text" msgid="1152839647677558815">"Tocar para ver la captura de pantalla"</string>
+    <!-- outdated translation 1140968728869009679 -->     <string name="screenshot_failed_title" msgid="705781116746922771">"Error al hacer captura de pantalla"</string>
+    <!-- outdated translation 9163506496592455352 -->     <string name="screenshot_failed_text" msgid="8134011269572415402">"Error al guardar la captura de pantalla. Es posible que el almacenamiento externo esté en uso."</string>
     <string name="usb_preference_title" msgid="6551050377388882787">"Opciones de transferencia de archivos por USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Activar como reproductor de medios (MTP)"</string>
     <string name="use_ptp_button_title" msgid="7517127540301625751">"Activar como cámara (PTP)"</string>
@@ -128,8 +121,7 @@
     <string name="accessibility_tty_enabled" msgid="4613200365379426561">"Teletipo habilitado"</string>
     <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"Modo vibración"</string>
     <string name="accessibility_ringer_silent" msgid="9061243307939135383">"Modo silencio"</string>
-    <!-- no translation found for accessibility_recents_item_dismissed (6803574935084867070) -->
-    <skip />
+    <string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"Se ha eliminado <xliff:g id="APP">%s</xliff:g>."</string>
     <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Datos 2G-3G inhabilitados"</string>
     <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Datos 4G inhabilitados"</string>
     <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Datos móviles inhabilitados"</string>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index ef1bf8e..1e9682a 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"گسترده کردن برای پر کردن صفحه"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"بزرگنمایی سازگاری"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"اگر یک برنامه برای صفحه کوچک تری طراحی شده باشد، یک کنترل بزرگنمایی توسط ساعت نشان داده می شود."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"گزینه های انتقال فایل USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"نصب به عنوان دستگاه پخش رسانه (MTP)"</string>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index 5ffa449..ea0144c0 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Venytä koko näyttöön"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Yhteensopivuustilan zoomaus"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Jos sovellus on suunniteltu pienemmälle näytölle, kellon viereen tulee näkyviin zoomaussäädin."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB-tiedostonsiirtoasetukset"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Käytä mediasoittimena (MTP)"</string>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index 29c608e..6e1125e 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Étirer pour remplir l\'écran"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom de compatibilité"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Si une application a été conçue pour un écran plus petit, une commande de zoom s\'affiche à côté de l\'horloge."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Options transfert fichiers USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Installer en tant que lecteur multimédia (MTP)"</string>
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index 688cc1b..d8219a0 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"स्‍क्रीन को भरने के लिए खींचें"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"संगतता ज़ूम"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"जब किसी छोटी स्‍क्रीन के लिए एप्‍लिकेशन को डिज़ाइन किया जाता है, तो ज़ूम नियंत्रण क्लॉक के पास दिखाई देगा."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB फ़ाइल स्थानांतरण विकल्प"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"मीडिया प्लेयर के रूप में माउंट करें (MTP)"</string>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index 017c72f..8a94890 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Rastegni i ispuni zaslon"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Kompatibilni zum"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Kada je aplikacija dizajnirana za manji zaslon, kontrole zumiranja prikazuju se pored sata."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Opcije USB prijenosa datoteka"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Učitaj kao media player (MTP)"</string>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index 73ae3dc..560379d 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Nyújtás kitöltéshez"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Kompatibilitás -- nagyítás/kicsinyítés"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Ha egy alkalmazást kisebb képernyőre terveztek, akkor a nagyítás/kicsinyítés vezérlője az óra mellett jelenik meg."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB-fájlátvitel beállításai"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Csatlakoztatás médialejátszóként (MTP)"</string>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index 1f53b1b..fb0c518 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Rentangkn utk mngisi layar"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom Kompatibilitas"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Saat apl dirancang untuk layar yang lebih kecil, kontrol zoom akan tampil di dekat jam."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Opsi transfer berkas USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Pasang sebagai pemutar media (MTP)"</string>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index c2cb0e7..e549950 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -62,20 +62,13 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Estendi per riemp. schermo"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom compatibilità"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Se un\'applicazione è stata progettata per uno schermo più piccolo, accanto all\'orologio viene visualizzato un controllo dello zoom."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
-    <skip />
+    <!-- outdated translation 3808900131607378535 -->     <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Salvataggio..."</string>
+    <!-- outdated translation 7158814134399651627 -->     <string name="screenshot_saving_title" msgid="8242282144535555697">"Salvataggio screenshot..."</string>
+    <!-- outdated translation 7138808001579871654 -->     <string name="screenshot_saving_text" msgid="2419718443411738818">"Attendi il salvataggio dello screenshot"</string>
+    <!-- outdated translation 1656379291643543172 -->     <string name="screenshot_saved_title" msgid="6461865960961414961">"Screenshot acquisito"</string>
+    <!-- outdated translation 5040360894749163221 -->     <string name="screenshot_saved_text" msgid="1152839647677558815">"Tocca per visualizzare il tuo screenshot"</string>
+    <!-- outdated translation 1140968728869009679 -->     <string name="screenshot_failed_title" msgid="705781116746922771">"Screenshot non riuscito"</string>
+    <!-- outdated translation 9163506496592455352 -->     <string name="screenshot_failed_text" msgid="8134011269572415402">"Salvataggio screenshot non riuscito. L\'archivio esterno potrebbe essere in uso."</string>
     <string name="usb_preference_title" msgid="6551050377388882787">"Opzioni trasferimento file USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Monta come lettore multimediale (MTP)"</string>
     <string name="use_ptp_button_title" msgid="7517127540301625751">"Monta come videocamera (PTP)"</string>
@@ -130,8 +123,7 @@
     <string name="accessibility_tty_enabled" msgid="4613200365379426561">"Telescrivente abilitata."</string>
     <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"Suoneria vibrazione."</string>
     <string name="accessibility_ringer_silent" msgid="9061243307939135383">"Suoneria silenziosa."</string>
-    <!-- no translation found for accessibility_recents_item_dismissed (6803574935084867070) -->
-    <skip />
+    <string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"<xliff:g id="APP">%s</xliff:g> eliminata."</string>
     <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Dati 2G-3G disattivati"</string>
     <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Dati 4G disattivati"</string>
     <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Dati mobili disattivati"</string>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index cdd36a6..9bc1304 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"מתח כדי למלא את המסך"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"שינוי מרחק מתצוגה לתאימות"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"כאשר יישום מיועד למסך קטן יותר, פקד של מרחק מתצוגה יופיע ליד השעון."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"אפשרויות העברת קבצים ב-USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"טען כנגן מדיה (MTP)"</string>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index 47292fb..7a1034d 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"画面サイズに合わせて拡大"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"互換ズーム"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"より小型の画面向けのアプリの場合は、ズームコントロールが時計のそばに表示されます。"</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USBファイル転送オプション"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"メディアプレーヤー(MTP)としてマウント"</string>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index e0a0ecf..1266a39 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"전체화면 모드로 확대"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"호환성 확대/축소"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"앱이 작은 화면에 맞도록 설계된 경우 시계 옆에 확대/축소 컨트롤이 표시됩니다."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB 파일 전송 옵션"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"미디어 플레이어로 마운트(MTP)"</string>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index b7f5aba..8157b33 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Ištempti, kad atit. ekr."</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Suderinamumo mastelio keitimas"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Kai programa bus pritaikyta mažesniam ekranui, mastelio keitimo valdiklis bus parodytas šalia laikrodžio."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB failo perdavimo parinktys"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Įmontuoti kaip medijos grotuvą (MTP)"</string>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index d6409c2..45129e9 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Stiepiet, lai aizp. ekr."</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Saderības tālummaiņa"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Ja lietotne ir paredzēta mazākam ekrānam, blakus pulkstenim tiks parādīta tālummaiņas vadīkla."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB failu pārsūtīšanas opcijas"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Pievienot kā multivides atskaņotāju (MTP)"</string>
diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml
index f84af39..3d5bda1 100644
--- a/packages/SystemUI/res/values-ms/strings.xml
+++ b/packages/SystemUI/res/values-ms/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Regang utk memenuhi skrin"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Keserasian Zum"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Apabila apl direka untuk skrin yang lebih kecil, kawalan zum akan muncul di tepi jam."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Pilihan pemindahan fail USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Lekapkan sebagai pemain media (MTP)"</string>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index 4db2e07..c917920 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Strekk for å fylle skjerm"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Kompatibilitets-zooming"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Når en app er utformet for en mindre skjerm, vises det en zoomkontroll ved klokken."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Altern. for USB-filoverføring"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Sett inn som mediespiller (MTP)"</string>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index 2a5cc66..339af46 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Rek uit v. schermvulling"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Compatibiliteitszoom"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Wanneer een app is ontworpen voor een kleiner scherm, wordt naast de klok een zoomknop weergegeven."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Opties voor USB-bestandsoverdracht"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Koppelen als mediaspeler (MTP)"</string>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index 00cbf95..e16e32b 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Rozciągnij, aby wypełnić ekran"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Powiększenie w trybie zgodności"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Jeśli aplikacja została przystosowana do mniejszego ekranu, obok zegara zostanie wyświetlony element sterujący powiększeniem."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB – opcje przesyłania plików"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Podłącz jako odtwarzacz multimedialny (MTP)"</string>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index c65ad95..fdbdf13 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Esticar p. caber em ec. int."</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Compatibilidade de zoom"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Sempre que uma aplicação tiver sido concebida para ecrãs mais pequenos, aparecerá um controlo de zoom junto ao relógio."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Opções de transm. de fich. USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Montar como leitor de multimédia (MTP)"</string>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index a37fdca..3d8f12e 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -62,20 +62,13 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Ampliar p/ preencher tela"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom em modo de compatibilidade"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Quando um aplicativo é desenvolvido para uma tela menor, um controle de zoom é exibido perto do relógio."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
-    <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
-    <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
-    <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
-    <skip />
+    <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Salvar captura de tela..."</string>
+    <string name="screenshot_saving_title" msgid="8242282144535555697">"Salvar captura de tela..."</string>
+    <string name="screenshot_saving_text" msgid="2419718443411738818">"A captura de tela está sendo salva."</string>
+    <string name="screenshot_saved_title" msgid="6461865960961414961">"Captura de tela obtida."</string>
+    <string name="screenshot_saved_text" msgid="1152839647677558815">"Toque para visualizar a captura de tela."</string>
+    <string name="screenshot_failed_title" msgid="705781116746922771">"Não foi possível obter a captura de tela."</string>
+    <string name="screenshot_failed_text" msgid="8134011269572415402">"Não foi possível salvar a captura de tela. O armazenamento pode estar em uso."</string>
     <string name="usb_preference_title" msgid="6551050377388882787">"Opções transf. arq. por USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Conectar como media player (MTP)"</string>
     <string name="use_ptp_button_title" msgid="7517127540301625751">"Montar como uma câmera (PTP)"</string>
diff --git a/packages/SystemUI/res/values-rm/strings.xml b/packages/SystemUI/res/values-rm/strings.xml
index 90271a3..e1db314 100644
--- a/packages/SystemUI/res/values-rm/strings.xml
+++ b/packages/SystemUI/res/values-rm/strings.xml
@@ -92,19 +92,19 @@
     <skip />
     <!-- no translation found for compat_mode_help_body (4946726776359270040) -->
     <skip />
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <!-- no translation found for usb_preference_title (6551050377388882787) -->
     <skip />
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index 084993b..22954a71 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Înt. pt. a umple ecranul"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom de compatibilitate"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Atunci când o aplicaţie a fost concepută pentru un ecran mai mic, o comandă pentru mărire/micşorare va apărea alături de ceas."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Opţiuni pentru transferul de fişiere prin USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Montaţi ca player media (MTP)"</string>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index c23d82b..40ad944 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Растянуть на весь экран"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Масштаб и совместимость"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Если приложение рассчитано на экран меньших размеров, рядом с часами появятся средства масштабирования."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Параметры передачи через USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Подключить как мультимедийный проигрыватель (MTP)"</string>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index af3ed00..37498fe 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Na celú obrazovku"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Kompatibilné priblíženie"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Ak je aplikácia navrhnutá pre menšiu obrazovku, zobrazí sa vedľa hodín ovládací prvok priblíženia."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Možnosti prenosu súborov USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Pripojiť ako prehrávač médií (MTP)"</string>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index 34c5e0b1..badde16 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Raztegnitev čez zaslon"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Povečava združljivosti"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Če je program izdelan za manjše zaslone, se ob uri pokaže kontrolnik za povečavo."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Možnosti prenosa datotek prek USB-ja"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Vpni kot predvajalnik (MTP)"</string>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index d0f24b2..6a91fa6 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Развуци на цео екран"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Компатибилно зумирање"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Када је апликација намењена мањем екрану, контрола зумирања приказује се поред сата."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Опције USB преноса датотека"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Прикључи као медија плејер (MTP)"</string>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index ab438e8..18d9750 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Dra för att fylla skärmen"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom i kompatibilitetsläge"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"När en app är anpassad för en mindre skärm visas ett zoomreglage vid klockan."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Överföringsalternativ"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Montera som mediaspelare (MTP)"</string>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index 98e2310..33371f1 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -60,19 +60,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Tanua ili kujaza skrini"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Kukuza kwa Utangamanifu"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Wakati programu ilibuniwa kwa skrini ndogo, kidhibiti cha kukuza kitaonekana kwa saa."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Machaguo ya uhamisho wa faili la USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Angika kama kichezeshi cha midia (MTP)"</string>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index ee2af5d..b78400d 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"ยืดจนเต็มหน้าจอ"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"ความเข้ากันได้ของการย่อ/ขยาย"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"สำหรับแอปพลิเคชันที่ออกแบบมาสำหรับหน้าจอขนาดเล็ก ตัวควบคุมการย่อ/ขยายจะปรากฏขึ้นข้างนาฬิกา"</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"ตัวเลือกการถ่ายโอนไฟล์ USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"ต่อเชื่อมเป็นโปรแกรมเล่นสื่อ (MTP)"</string>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index 8cff0b3..7778a10 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"I-stretch upang mapuno screen"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Zoom sa Pagiging Tugma"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Kapag nakadisenyo ang isang app para sa mas maliit na screen, isang kontrol ng zoom ang lalabas sa may orasan."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Opsyon paglipat ng USB file"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"I-mount bilang isang media player (MTP)"</string>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index 7fd5c61..2e1691b 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Genişlet (ekran kapansın)"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Uyumluluk Zum\'u"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Uygulama küçük bir ekran için tasarlanmışsa saatin yanında bir yakınlaştırma denetimi görünür."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB dosya aktarım seçenekleri"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Medya oynatıcı olarak ekle (MTP)"</string>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index 5b92cc0..36084eb 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Розтягнути на весь екран"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Елемент керування масштабом для сумісності"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Якщо програму призначено для менших екранів, елемент керування масштабом буде відображатися біля годинника."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Парам.передав.файлів через USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Підключити як медіапрогравач (MTP)"</string>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index d1158e4..f804146 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Giãn ra để lấp đầy m.hình"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Thu phóng tương thích"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Khi ứng dụng được thiết kế cho một màn hình nhỏ hơn, điều khiển thu phóng sẽ xuất hiện bên cạnh đồng hồ."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Tùy chọn truyền tệp USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Gắn như một trình phát đa phương tiện (MTP)"</string>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index 2b1bfd6..271aac0 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"拉伸以填满屏幕"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"兼容性缩放"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"如果应用程序是针对较小屏幕设计的,则时钟旁会显示缩放控件。"</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB 文件传输选项"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"作为媒体播放器 (MTP) 装载"</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index 2ffca64..cc00e66 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"放大為全螢幕"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"相容性縮放"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"執行專為較小螢幕設計的應用程式時,系統會在時鐘旁顯示縮放控制項。"</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"USB 檔案傳輸選項"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"掛接為媒體播放器 (MTP)"</string>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index 5ef5152..4bbb11d 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -62,19 +62,19 @@
     <string name="compat_mode_off" msgid="4434467572461327898">"Nweba ukugcwalisa isikrini"</string>
     <string name="compat_mode_help_header" msgid="7020175705401506719">"Ukuhambelana Kokusondeza"</string>
     <string name="compat_mode_help_body" msgid="4946726776359270040">"Uma uhlelo lokusebenza lwenzelwe isikrini ezincane, isilawuli sokusondeza sizovela ngakuyiwashi."</string>
-    <!-- no translation found for screenshot_saving_ticker (3808900131607378535) -->
+    <!-- no translation found for screenshot_saving_ticker (7403652894056693515) -->
     <skip />
-    <!-- no translation found for screenshot_saving_title (7158814134399651627) -->
+    <!-- no translation found for screenshot_saving_title (8242282144535555697) -->
     <skip />
-    <!-- no translation found for screenshot_saving_text (7138808001579871654) -->
+    <!-- no translation found for screenshot_saving_text (2419718443411738818) -->
     <skip />
-    <!-- no translation found for screenshot_saved_title (1656379291643543172) -->
+    <!-- no translation found for screenshot_saved_title (6461865960961414961) -->
     <skip />
-    <!-- no translation found for screenshot_saved_text (5040360894749163221) -->
+    <!-- no translation found for screenshot_saved_text (1152839647677558815) -->
     <skip />
-    <!-- no translation found for screenshot_failed_title (1140968728869009679) -->
+    <!-- no translation found for screenshot_failed_title (705781116746922771) -->
     <skip />
-    <!-- no translation found for screenshot_failed_text (9163506496592455352) -->
+    <!-- no translation found for screenshot_failed_text (8134011269572415402) -->
     <skip />
     <string name="usb_preference_title" msgid="6551050377388882787">"Okukhethwa kokudluliswa kwefayela ye-USB"</string>
     <string name="use_mtp_button_title" msgid="4333504413563023626">"Lengisa njengesidlali semediya (MTP)"</string>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index 4f9eb38..1d4b9ba 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -95,7 +95,7 @@
     final WifiManager mWifiManager;
     AsyncChannel mWifiChannel;
     boolean mWifiEnabled, mWifiConnected;
-    int mWifiLevel;
+    int mWifiRssi, mWifiLevel;
     String mWifiSsid;
     int mWifiIconId = 0;
     int mWifiActivityIconId = 0; // overlay arrows for wifi direction
@@ -654,24 +654,29 @@
             mWifiConnected = networkInfo != null && networkInfo.isConnected();
             // If we just connected, grab the inintial signal strength and ssid
             if (mWifiConnected && !wasConnected) {
-                WifiInfo info = mWifiManager.getConnectionInfo();
+                // try getting it out of the intent first
+                WifiInfo info = (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO);
+                if (info == null) {
+                    info = mWifiManager.getConnectionInfo();
+                }
                 if (info != null) {
-                    mWifiLevel = WifiManager.calculateSignalLevel(info.getRssi(),
-                            WifiIcons.WIFI_LEVEL_COUNT);
                     mWifiSsid = huntForSsid(info);
                 } else {
-                    mWifiLevel = 0;
                     mWifiSsid = null;
                 }
             } else if (!mWifiConnected) {
-                mWifiLevel = 0;
                 mWifiSsid = null;
             }
-
+            // Apparently the wifi level is not stable at this point even if we've just connected to
+            // the network; we need to wait for an RSSI_CHANGED_ACTION for that. So let's just set
+            // it to 0 for now
+            mWifiLevel = 0;
+            mWifiRssi = -200;
         } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) {
             if (mWifiConnected) {
-                final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200);
-                mWifiLevel = WifiManager.calculateSignalLevel(newRssi, WifiIcons.WIFI_LEVEL_COUNT);
+                mWifiRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200);
+                mWifiLevel = WifiManager.calculateSignalLevel(
+                        mWifiRssi, WifiIcons.WIFI_LEVEL_COUNT);
             }
         }
 
@@ -1031,6 +1036,8 @@
         pw.println(mWifiEnabled);
         pw.print("  mWifiConnected=");
         pw.println(mWifiConnected);
+        pw.print("  mWifiRssi=");
+        pw.println(mWifiRssi);
         pw.print("  mWifiLevel=");
         pw.println(mWifiLevel);
         pw.print("  mWifiSsid=");