From c26405f363daa90e10d5eb05f26352dff3828ed3 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Thu, 26 Jan 2017 15:02:41 -0800
Subject: Automatic translation import

Change-Id: Ib115f3813214bfffb935cf522d0e31e8c95be4de
---
 packages/DocumentsUI/res/values-lb/strings.xml     |  6 ++
 packages/Keyguard/res/values-as-rIN/strings.xml    |  2 -
 packages/Keyguard/res/values-ast-rES/strings.xml   |  2 -
 packages/Keyguard/res/values-br-rFR/strings.xml    |  2 -
 packages/Keyguard/res/values-csb-rPL/strings.xml   |  2 -
 packages/Keyguard/res/values-cy/strings.xml        |  2 -
 packages/Keyguard/res/values-en-rPT/strings.xml    |  2 -
 packages/Keyguard/res/values-eo/strings.xml        |  2 -
 packages/Keyguard/res/values-es-rCO/strings.xml    |  2 -
 packages/Keyguard/res/values-es-rMX/strings.xml    |  2 -
 packages/Keyguard/res/values-frp-rIT/strings.xml   |  2 -
 packages/Keyguard/res/values-fy-rNL/strings.xml    |  2 -
 packages/Keyguard/res/values-ga-rIE/strings.xml    |  2 -
 packages/Keyguard/res/values-gd-rGB/strings.xml    |  2 -
 packages/Keyguard/res/values-gl-rES/cm_strings.xml |  4 +
 packages/Keyguard/res/values-ku/strings.xml        |  2 -
 packages/Keyguard/res/values-lb/strings.xml        |  2 -
 packages/Keyguard/res/values-oc-rFR/strings.xml    |  2 -
 packages/Keyguard/res/values-or-rIN/strings.xml    |  2 -
 packages/Keyguard/res/values-ro/cm_strings.xml     |  6 ++
 packages/Keyguard/res/values-ug/strings.xml        |  2 -
 packages/Keyguard/res/values-zh-rCN/cm_strings.xml |  2 +-
 packages/SettingsLib/res/values-as-rIN/arrays.xml  |  2 -
 packages/SettingsLib/res/values-ast-rES/arrays.xml |  2 -
 packages/SettingsLib/res/values-br-rFR/arrays.xml  |  2 -
 packages/SettingsLib/res/values-csb-rPL/arrays.xml |  2 -
 packages/SettingsLib/res/values-cy/arrays.xml      |  2 -
 packages/SettingsLib/res/values-en-rPT/arrays.xml  |  2 -
 packages/SettingsLib/res/values-eo/arrays.xml      |  2 -
 packages/SettingsLib/res/values-es-rCO/arrays.xml  |  2 -
 packages/SettingsLib/res/values-es-rMX/arrays.xml  |  2 -
 packages/SettingsLib/res/values-frp-rIT/arrays.xml |  2 -
 packages/SettingsLib/res/values-fy-rNL/arrays.xml  |  2 -
 packages/SettingsLib/res/values-ga-rIE/arrays.xml  |  2 -
 packages/SettingsLib/res/values-gd-rGB/arrays.xml  |  2 -
 packages/SettingsLib/res/values-ku/arrays.xml      |  2 -
 packages/SettingsLib/res/values-lb/arrays.xml      |  2 -
 packages/SettingsLib/res/values-oc-rFR/arrays.xml  |  2 -
 packages/SettingsLib/res/values-or-rIN/arrays.xml  |  2 -
 packages/SettingsLib/res/values-ug/arrays.xml      |  2 -
 .../SettingsLib/res/values-zh-rTW/cm_strings.xml   |  2 +-
 packages/SystemUI/res/values-as-rIN/strings.xml    |  1 -
 packages/SystemUI/res/values-ast-rES/strings.xml   |  1 -
 packages/SystemUI/res/values-br-rFR/strings.xml    |  1 -
 packages/SystemUI/res/values-cs/cm_strings.xml     |  1 +
 packages/SystemUI/res/values-csb-rPL/strings.xml   |  1 -
 packages/SystemUI/res/values-cy/strings.xml        |  1 -
 packages/SystemUI/res/values-en-rPT/strings.xml    |  1 -
 packages/SystemUI/res/values-eo/strings.xml        |  1 -
 packages/SystemUI/res/values-es-rCO/strings.xml    |  1 -
 packages/SystemUI/res/values-es-rMX/strings.xml    |  1 -
 packages/SystemUI/res/values-fi/cm_strings.xml     |  1 +
 packages/SystemUI/res/values-frp-rIT/strings.xml   |  1 -
 packages/SystemUI/res/values-fy-rNL/strings.xml    |  1 -
 packages/SystemUI/res/values-ga-rIE/strings.xml    |  1 -
 packages/SystemUI/res/values-gd-rGB/strings.xml    |  1 -
 packages/SystemUI/res/values-ku/strings.xml        |  1 -
 packages/SystemUI/res/values-lb/strings.xml        |  1 -
 packages/SystemUI/res/values-nb/cm_strings.xml     |  6 +-
 packages/SystemUI/res/values-oc-rFR/strings.xml    |  1 -
 packages/SystemUI/res/values-or-rIN/strings.xml    |  1 -
 packages/SystemUI/res/values-ro/cm_strings.xml     | 21 ++++++
 packages/SystemUI/res/values-ug/strings.xml        |  1 -
 packages/SystemUI/res/values-zh-rCN/cm_strings.xml |  4 +-
 packages/SystemUI/res/values-zh-rTW/cm_strings.xml | 86 +++++++++++-----------
 65 files changed, 89 insertions(+), 140 deletions(-)

(limited to 'packages')

diff --git a/packages/DocumentsUI/res/values-lb/strings.xml b/packages/DocumentsUI/res/values-lb/strings.xml
index 5bcd64f..3d6545d 100644
--- a/packages/DocumentsUI/res/values-lb/strings.xml
+++ b/packages/DocumentsUI/res/values-lb/strings.xml
@@ -42,6 +42,7 @@
   <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">Läschen</string>
   <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <string name="menu_select_all">Alles auswielen</string>
   <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
   <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="nosdcard">Interne Späicher uweisen</string>
@@ -56,7 +57,9 @@
   <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_hide">Fichiersgréisst verstoppen</string>
   <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <string name="button_select">Auswielen</string>
   <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <string name="button_copy">Kopéieren</string>
   <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">No Numm</string>
   <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
@@ -94,11 +97,14 @@
   <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
   <string name="share_via">Deelen iwwer</string>
   <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <string name="copy_notification_title">Fichiere gi kopéiert</string>
   <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <string name="copy_remaining"><xliff:g id="duration" example="3 minutes">%s</xliff:g> iwwreg</string>
   <!-- Toast shown when a file copy is kicked off -->
   <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
   <!-- Title of the copy error notification [CHAR LIMIT=48] -->
   <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
   <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <string name="retry">Nees probéieren</string>
   <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
 </resources>
diff --git a/packages/Keyguard/res/values-as-rIN/strings.xml b/packages/Keyguard/res/values-as-rIN/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-as-rIN/strings.xml
+++ b/packages/Keyguard/res/values-as-rIN/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ast-rES/strings.xml b/packages/Keyguard/res/values-ast-rES/strings.xml
index 37a1824..c268778 100644
--- a/packages/Keyguard/res/values-ast-rES/strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/strings.xml
@@ -60,7 +60,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Empobina al menú pa desbloquiar la pantalla.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Bloquiada pa la rede</string>
   <!-- Shown when there is no SIM card. -->
@@ -102,7 +101,6 @@
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Próxima alarma afitada a les <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Desaniciar</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-br-rFR/strings.xml b/packages/Keyguard/res/values-br-rFR/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-br-rFR/strings.xml
+++ b/packages/Keyguard/res/values-br-rFR/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-csb-rPL/strings.xml b/packages/Keyguard/res/values-csb-rPL/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-csb-rPL/strings.xml
+++ b/packages/Keyguard/res/values-csb-rPL/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-cy/strings.xml b/packages/Keyguard/res/values-cy/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-cy/strings.xml
+++ b/packages/Keyguard/res/values-cy/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-en-rPT/strings.xml b/packages/Keyguard/res/values-en-rPT/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-en-rPT/strings.xml
+++ b/packages/Keyguard/res/values-en-rPT/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-eo/strings.xml b/packages/Keyguard/res/values-eo/strings.xml
index 798b667..170dcac 100644
--- a/packages/Keyguard/res/values-eo/strings.xml
+++ b/packages/Keyguard/res/values-eo/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Forigi</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-es-rCO/strings.xml b/packages/Keyguard/res/values-es-rCO/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-es-rCO/strings.xml
+++ b/packages/Keyguard/res/values-es-rCO/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-es-rMX/strings.xml b/packages/Keyguard/res/values-es-rMX/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-es-rMX/strings.xml
+++ b/packages/Keyguard/res/values-es-rMX/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-frp-rIT/strings.xml b/packages/Keyguard/res/values-frp-rIT/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-frp-rIT/strings.xml
+++ b/packages/Keyguard/res/values-frp-rIT/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-fy-rNL/strings.xml b/packages/Keyguard/res/values-fy-rNL/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-fy-rNL/strings.xml
+++ b/packages/Keyguard/res/values-fy-rNL/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ga-rIE/strings.xml b/packages/Keyguard/res/values-ga-rIE/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-ga-rIE/strings.xml
+++ b/packages/Keyguard/res/values-ga-rIE/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-gd-rGB/strings.xml b/packages/Keyguard/res/values-gd-rGB/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-gd-rGB/strings.xml
+++ b/packages/Keyguard/res/values-gd-rGB/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-gl-rES/cm_strings.xml b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
index 4221609..314940a 100644
--- a/packages/Keyguard/res/values-gl-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
@@ -21,6 +21,10 @@
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Esta tarxeta non é válida.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de ter que comunicarte con a tua operadora para desbloquear o dispositivo.</item>
+    <item quantity="other">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Erro: O dato introducido é máis curto có mínimo esixido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ku/strings.xml b/packages/Keyguard/res/values-ku/strings.xml
index 5861ec9..336eff9 100644
--- a/packages/Keyguard/res/values-ku/strings.xml
+++ b/packages/Keyguard/res/values-ku/strings.xml
@@ -56,7 +56,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">دەست بنێ بە پێڕستدا بۆ کردنه‌وه‌.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تۆڕی نێت داخرا</string>
   <!-- Shown when there is no SIM card. -->
@@ -98,7 +97,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">سڕینه‌وه‌</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-lb/strings.xml b/packages/Keyguard/res/values-lb/strings.xml
index 2ee72e8..0763983 100644
--- a/packages/Keyguard/res/values-lb/strings.xml
+++ b/packages/Keyguard/res/values-lb/strings.xml
@@ -60,7 +60,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menü drécke fir z\'entspären.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Netzwierk gespaart</string>
   <!-- Shown when there is no SIM card. -->
@@ -106,7 +105,6 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Nächste Wecker gesat fir <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Läschen</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-oc-rFR/strings.xml b/packages/Keyguard/res/values-oc-rFR/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-oc-rFR/strings.xml
+++ b/packages/Keyguard/res/values-oc-rFR/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-or-rIN/strings.xml b/packages/Keyguard/res/values-or-rIN/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-or-rIN/strings.xml
+++ b/packages/Keyguard/res/values-or-rIN/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ro/cm_strings.xml b/packages/Keyguard/res/values-ro/cm_strings.xml
index c9a5723..4cfd544 100644
--- a/packages/Keyguard/res/values-ro/cm_strings.xml
+++ b/packages/Keyguard/res/values-ro/cm_strings.xml
@@ -17,9 +17,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">Cardul SIM este Perso blocat</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Cartelă SIM incorectă.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> încercare rămasă înainte de a trebui să contactaţi compania de rețea mobilă pentru a debloca dispozitivul.</item>
+    <item quantity="few">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
+    <item quantity="other">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Eroare: Introducere mai scurtă decât lungimea minimă</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ug/strings.xml b/packages/Keyguard/res/values-ug/strings.xml
index 232d6dc..6ad14ee 100644
--- a/packages/Keyguard/res/values-ug/strings.xml
+++ b/packages/Keyguard/res/values-ug/strings.xml
@@ -56,7 +56,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menu نى بېسىپ قۇلۇپنى ئېچىڭ.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تور قۇلۇپلانغان</string>
   <!-- Shown when there is no SIM card. -->
@@ -97,7 +96,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">ئۆچۈر</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
index 6f94967..948efc1 100644
--- a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
@@ -22,7 +22,7 @@
   <string name="lockscreen_sim_error_message_short">无效的 SIM 卡。</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
-    <item quantity="other">输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会；若超出此次数，则必须联系运营商以解锁 SIM 卡。</item>
+    <item quantity="other">请输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会。若超出此次数，则必须为解锁 SIM 卡求助运营商。</item>
   </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">错误：输入长度小于最小长度</string>
diff --git a/packages/SettingsLib/res/values-as-rIN/arrays.xml b/packages/SettingsLib/res/values-as-rIN/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-as-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-as-rIN/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/arrays.xml b/packages/SettingsLib/res/values-ast-rES/arrays.xml
index 944d2b2..1d95ab1 100644
--- a/packages/SettingsLib/res/values-ast-rES/arrays.xml
+++ b/packages/SettingsLib/res/values-ast-rES/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -50,7 +49,6 @@
     <item>Desactivando mala conexón temporalmente</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
diff --git a/packages/SettingsLib/res/values-br-rFR/arrays.xml b/packages/SettingsLib/res/values-br-rFR/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-br-rFR/arrays.xml
+++ b/packages/SettingsLib/res/values-br-rFR/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-csb-rPL/arrays.xml b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-csb-rPL/arrays.xml
+++ b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-cy/arrays.xml b/packages/SettingsLib/res/values-cy/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-cy/arrays.xml
+++ b/packages/SettingsLib/res/values-cy/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-en-rPT/arrays.xml b/packages/SettingsLib/res/values-en-rPT/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-en-rPT/arrays.xml
+++ b/packages/SettingsLib/res/values-en-rPT/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-eo/arrays.xml b/packages/SettingsLib/res/values-eo/arrays.xml
index 024e633..f60a34d 100644
--- a/packages/SettingsLib/res/values-eo/arrays.xml
+++ b/packages/SettingsLib/res/values-eo/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -50,7 +49,6 @@
     <item>Temporarily avoiding poor connection</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
diff --git a/packages/SettingsLib/res/values-es-rCO/arrays.xml b/packages/SettingsLib/res/values-es-rCO/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-es-rCO/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rCO/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-es-rMX/arrays.xml b/packages/SettingsLib/res/values-es-rMX/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-es-rMX/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rMX/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-frp-rIT/arrays.xml b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-frp-rIT/arrays.xml
+++ b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-fy-rNL/arrays.xml b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-fy-rNL/arrays.xml
+++ b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ga-rIE/arrays.xml b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-ga-rIE/arrays.xml
+++ b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-gd-rGB/arrays.xml b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-gd-rGB/arrays.xml
+++ b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ku/arrays.xml b/packages/SettingsLib/res/values-ku/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-ku/arrays.xml
+++ b/packages/SettingsLib/res/values-ku/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-lb/arrays.xml b/packages/SettingsLib/res/values-lb/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-lb/arrays.xml
+++ b/packages/SettingsLib/res/values-lb/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-oc-rFR/arrays.xml b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-oc-rFR/arrays.xml
+++ b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-or-rIN/arrays.xml b/packages/SettingsLib/res/values-or-rIN/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-or-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-or-rIN/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ug/arrays.xml b/packages/SettingsLib/res/values-ug/arrays.xml
index f954c2b..e4f82d3 100644
--- a/packages/SettingsLib/res/values-ug/arrays.xml
+++ b/packages/SettingsLib/res/values-ug/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -50,6 +49,5 @@
     <item>Temporarily avoiding poor connection</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml b/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
index 964e5f4..478d992 100644
--- a/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
@@ -23,5 +23,5 @@
   <string name="picker_activities">活動</string>
   <string name="select_custom_app_title">選取自訂應用程式</string>
   <string name="select_custom_activity_title">選取自訂活動</string>
-  <string name="lockscreen_targets_message">鎖定螢幕捷徑</string>
+  <string name="lockscreen_targets_message">鎖定畫面捷徑</string>
 </resources>
diff --git a/packages/SystemUI/res/values-as-rIN/strings.xml b/packages/SystemUI/res/values-as-rIN/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-as-rIN/strings.xml
+++ b/packages/SystemUI/res/values-as-rIN/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ast-rES/strings.xml b/packages/SystemUI/res/values-ast-rES/strings.xml
index 12b0b8c..3b9cdb0 100644
--- a/packages/SystemUI/res/values-ast-rES/strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/strings.xml
@@ -653,7 +653,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time_slowly">Carga lenta (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar la carga)</string>
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Camudar usuariu</string>
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
diff --git a/packages/SystemUI/res/values-br-rFR/strings.xml b/packages/SystemUI/res/values-br-rFR/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-br-rFR/strings.xml
+++ b/packages/SystemUI/res/values-br-rFR/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-cs/cm_strings.xml b/packages/SystemUI/res/values-cs/cm_strings.xml
index 4a0fc63..7f16da9 100644
--- a/packages/SystemUI/res/values-cs/cm_strings.xml
+++ b/packages/SystemUI/res/values-cs/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Další budík</string>
   <string name="dynamic_qs_tile_ime_selector_label">Výběr IME</string>
   <string name="dynamic_qs_tile_su_label">Root přístup</string>
+  <string name="dynamic_qs_tile_themes_label">Motivy</string>
   <string name="quick_settings_title_advanced_location">Třístavové nastavení určení polohy</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Zjištění polohy: úsporný režim.</string>
diff --git a/packages/SystemUI/res/values-csb-rPL/strings.xml b/packages/SystemUI/res/values-csb-rPL/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-csb-rPL/strings.xml
+++ b/packages/SystemUI/res/values-csb-rPL/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-cy/strings.xml b/packages/SystemUI/res/values-cy/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-cy/strings.xml
+++ b/packages/SystemUI/res/values-cy/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-en-rPT/strings.xml b/packages/SystemUI/res/values-en-rPT/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-en-rPT/strings.xml
+++ b/packages/SystemUI/res/values-en-rPT/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-eo/strings.xml b/packages/SystemUI/res/values-eo/strings.xml
index 2f749ba..8041df8 100644
--- a/packages/SystemUI/res/values-eo/strings.xml
+++ b/packages/SystemUI/res/values-eo/strings.xml
@@ -367,7 +367,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-es-rCO/strings.xml b/packages/SystemUI/res/values-es-rCO/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-es-rCO/strings.xml
+++ b/packages/SystemUI/res/values-es-rCO/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-es-rMX/strings.xml b/packages/SystemUI/res/values-es-rMX/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-es-rMX/strings.xml
+++ b/packages/SystemUI/res/values-es-rMX/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-fi/cm_strings.xml b/packages/SystemUI/res/values-fi/cm_strings.xml
index c6e454d..becd5cb 100644
--- a/packages/SystemUI/res/values-fi/cm_strings.xml
+++ b/packages/SystemUI/res/values-fi/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Seuraava hälytys</string>
   <string name="dynamic_qs_tile_ime_selector_label">Syöttötavan valitsin</string>
   <string name="dynamic_qs_tile_su_label">Root-oikeudet</string>
+  <string name="dynamic_qs_tile_themes_label">Teemat</string>
   <string name="quick_settings_title_advanced_location">Sijainnin lisäasetukset</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Sijainnin raportointi: virransäästötila.</string>
diff --git a/packages/SystemUI/res/values-frp-rIT/strings.xml b/packages/SystemUI/res/values-frp-rIT/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-frp-rIT/strings.xml
+++ b/packages/SystemUI/res/values-frp-rIT/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-fy-rNL/strings.xml b/packages/SystemUI/res/values-fy-rNL/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-fy-rNL/strings.xml
+++ b/packages/SystemUI/res/values-fy-rNL/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ga-rIE/strings.xml b/packages/SystemUI/res/values-ga-rIE/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-ga-rIE/strings.xml
+++ b/packages/SystemUI/res/values-ga-rIE/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-gd-rGB/strings.xml b/packages/SystemUI/res/values-gd-rGB/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-gd-rGB/strings.xml
+++ b/packages/SystemUI/res/values-gd-rGB/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ku/strings.xml b/packages/SystemUI/res/values-ku/strings.xml
index 4799c13..87d89bb 100644
--- a/packages/SystemUI/res/values-ku/strings.xml
+++ b/packages/SystemUI/res/values-ku/strings.xml
@@ -535,7 +535,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-lb/strings.xml b/packages/SystemUI/res/values-lb/strings.xml
index 9505026..0217846 100644
--- a/packages/SystemUI/res/values-lb/strings.xml
+++ b/packages/SystemUI/res/values-lb/strings.xml
@@ -609,7 +609,6 @@ iwwerwaacht sinn</string>
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time_slowly">Gëtt lues opgelueden (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> bis e voll ass)</string>
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Benotzer wiesselen</string>
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
diff --git a/packages/SystemUI/res/values-nb/cm_strings.xml b/packages/SystemUI/res/values-nb/cm_strings.xml
index ebef919..4a9478f 100644
--- a/packages/SystemUI/res/values-nb/cm_strings.xml
+++ b/packages/SystemUI/res/values-nb/cm_strings.xml
@@ -86,7 +86,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">System profiler</string>
   <string name="quick_settings_profiles_off">Profiler deaktivert</string>
-  <string name="quick_settings_heads_up_label">Flytende notifikasjoner</string>
+  <string name="quick_settings_heads_up_label">Flytende varsler</string>
   <string name="quick_settings_battery_saver_label">Batterisparing</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
   <string name="quick_settings_battery_saver_label_charging">Batterisparing (lading)</string>
@@ -150,9 +150,9 @@
   <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient skjerm er skrudd på.</string>
   <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_heads_up_off">Heads up notifikasjoner er av.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up varsler er av.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_heads_up_on">Heads up notifikasjoner er på.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up varsler er på.</string>
   <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up ble deaktivert.</string>
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/res/values-oc-rFR/strings.xml b/packages/SystemUI/res/values-oc-rFR/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-oc-rFR/strings.xml
+++ b/packages/SystemUI/res/values-oc-rFR/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-or-rIN/strings.xml b/packages/SystemUI/res/values-or-rIN/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-or-rIN/strings.xml
+++ b/packages/SystemUI/res/values-or-rIN/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ro/cm_strings.xml b/packages/SystemUI/res/values-ro/cm_strings.xml
index 2ef4e1d..47f93a8 100644
--- a/packages/SystemUI/res/values-ro/cm_strings.xml
+++ b/packages/SystemUI/res/values-ro/cm_strings.xml
@@ -29,6 +29,7 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Glisați dreapta pentru %1$s</string>
   <string name="right_shortcut_hint">Glisați stânga pentru %1$s</string>
+  <string name="lockscreen_message">Apăsaţi o pictogramă din stânga sau dreapta pentru a realoca o comandă rapidă pe ecranul de blocare.</string>
   <string name="lockscreen_default_target">Implicit</string>
   <string name="select_application">Selectați aplicația</string>
   <string name="lockscreen_choose_action_title">Alege acțiunea</string>
@@ -53,6 +54,7 @@
   <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Dezinstalați</string>
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Luminozitate lumină</string>
   <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiluri oprit.</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -64,6 +66,7 @@
   <string name="quick_settings_compass_init">Inițializare\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Setări de lumină</string>
+  <string name="led_notification_text">Lumină LED activată de setări</string>
   <string name="qs_tile_edit_header_instruction">Apăsați și țineți apăsate chenarele pentru a rearanja</string>
   <string name="quick_settings_edit_label">Editare chenare</string>
   <string name="quick_settings_cannot_delete_edit_tile">Nu se poate șterge chenarul Editare</string>
@@ -75,6 +78,7 @@
   <string name="quick_settings_title_show_brightness_slider">Arată glisorul de luminozitate</string>
   <string name="quick_settings_title_enlarge_first_row">Mărește primul rând</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Aceasta ține în vizualizare ecranul până îl deblocați. Apăsați și țineți apăsat butonul Înapoi pentru a debloca.</string>
   <string name="quick_settings_custom_tile_detail_title">Chenar personalizat</string>
   <string name="quick_settings_remove">Eliminare chenar</string>
   <string name="quick_settings_network_adb_label">ADB prin rețea</string>
@@ -85,6 +89,7 @@
   <string name="quick_settings_heads_up_label">Atenționare</string>
   <string name="quick_settings_battery_saver_label">Economizor baterie</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Economizor de baterie (încărcare)</string>
   <string name="quick_settings_caffeine_label">Cofeină</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sincronizare oprită.</string>
@@ -133,17 +138,25 @@
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Blocare ecran pornit.</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">Ecran de blocare dezactivat.</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Ecran de blocare activat.</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Afișare ambientală oprită.</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Afișare ambientală pornită.</string>
   <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Afișaj ambiental dezactivat.</string>
   <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Afișaj ambiental activat.</string>
   <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Heads-up oprit.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Heads-up pornit.</string>
   <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up a fost oprit.</string>
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads-up a fost pornit.</string>
   <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Cofeină oprit.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -161,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Următoarea alarmă</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
   <string name="dynamic_qs_tile_su_label">Acces root</string>
+  <string name="dynamic_qs_tile_themes_label">Teme</string>
   <string name="quick_settings_title_advanced_location">Starea celor 3 moduri de locație</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Raportarea locației: mod economisire baterie.</string>
@@ -197,10 +211,17 @@
     <item quantity="other">%1$d clienți</item>
   </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Nu există date SIM</string>
   <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Procent baterie <xliff:g id="number">%d</xliff:g> andocată.</string>
   <!-- Play queue -->
+  <string name="play_queue_extention">Afișare coadă de redare</string>
   <!-- Path data for portrait battery -->
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Glisați în jos pentru a extinde</string>
+  <string name="swipe_left_hint">Glisați stânga pentru a <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Glisați dreapta pentru notificări</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ug/strings.xml b/packages/SystemUI/res/values-ug/strings.xml
index 6c4dac3..95d4f4d 100644
--- a/packages/SystemUI/res/values-ug/strings.xml
+++ b/packages/SystemUI/res/values-ug/strings.xml
@@ -493,7 +493,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
index 525300b..0b882eb 100644
--- a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
@@ -42,7 +42,7 @@
   <string name="navbar_back_button">返回键</string>
   <string name="navbar_empty_button">空白键</string>
   <string name="navbar_menu_conditional_button">菜单键 (自动隐藏)</string>
-  <string name="navbar_menu_always_button">菜单键 (总是显示)</string>
+  <string name="navbar_menu_always_button">菜单键 (始终显示)</string>
   <string name="navbar_menu_big_button">菜单键</string>
   <string name="accessibility_dpad_left">光标左移</string>
   <string name="accessibility_dpad_right">光标右移</string>
@@ -62,7 +62,7 @@
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">情景模式已关闭。</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_profiles_changed">情景模式已修改为<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
+  <string name="accessibility_quick_settings_profiles_changed">情景模式已更改为<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
   <string name="quick_settings_compass_init">正在初始化\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示灯设置</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index b85480b..16560d7 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -29,14 +29,14 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">向右滑動即可%1$s</string>
   <string name="right_shortcut_hint">向左滑動即可%1$s</string>
-  <string name="lockscreen_message">輕觸左側或右側的圖示即可設定鎖定螢幕捷徑</string>
+  <string name="lockscreen_message">輕觸左側或右側的圖示即可設定鎖定畫面捷徑</string>
   <string name="lockscreen_default_target">預設</string>
-  <string name="select_application">選取應用程式</string>
-  <string name="lockscreen_choose_action_title">選取操作</string>
+  <string name="select_application">選擇應用程式</string>
+  <string name="lockscreen_choose_action_title">選擇動作</string>
   <string name="lockscreen_none_target">無</string>
   <!-- Dialog title for navigation bar button selection -->
-  <string name="navbar_dialog_title">選擇要指定的操作</string>
-  <string name="navbar_home_button">主螢幕鍵</string>
+  <string name="navbar_dialog_title">選擇要指定的動作</string>
+  <string name="navbar_home_button">主畫面鍵</string>
   <string name="navbar_recent_button">多工鍵</string>
   <string name="navbar_search_button">搜尋鍵</string>
   <string name="navbar_back_button">返回鍵</string>
@@ -62,25 +62,25 @@
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">設定檔已關閉</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_profiles_changed">設定檔已更改為<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
-  <string name="quick_settings_compass_init">正在初始化\u2026</string>
+  <string name="accessibility_quick_settings_profiles_changed">設定檔已變更為<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
+  <string name="quick_settings_compass_init">初始化中\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
-  <string name="qs_tile_edit_header_instruction">按住瓷磚即可重新排列</string>
-  <string name="quick_settings_edit_label">編輯瓷磚</string>
-  <string name="quick_settings_cannot_delete_edit_tile">無法刪除編輯瓷磚</string>
-  <string name="qs_tiles_reset_confirmation">是否將快速設定瓷磚還原至預設配置？</string>
+  <string name="qs_tile_edit_header_instruction">按住圖塊即可重新排列</string>
+  <string name="quick_settings_edit_label">編輯圖塊</string>
+  <string name="quick_settings_cannot_delete_edit_tile">無法刪除編輯圖塊</string>
+  <string name="qs_tiles_reset_confirmation">將快速設定圖塊還原至預設配置？</string>
   <string name="quick_settings_tile_reset_to_default">還原至預設布局</string>
   <string name="quick_settings_title_header">標題</string>
-  <string name="quick_settings_title_tiles">瓷磚</string>
+  <string name="quick_settings_title_tiles">圖塊</string>
   <string name="quick_settings_title_show_weather">顯示天氣資訊</string>
-  <string name="quick_settings_title_show_brightness_slider">顯示亮度滑桿</string>
+  <string name="quick_settings_title_show_brightness_slider">顯示亮度滑動條</string>
   <string name="quick_settings_title_enlarge_first_row">擴大首行</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
-  <string name="screen_pinning_description_no_navbar">此功能會固定螢幕顯示直到您取消固定。觸控並長按返回鍵即可解除固定。</string>
-  <string name="quick_settings_custom_tile_detail_title">自訂瓷磚</string>
-  <string name="quick_settings_remove">移除瓷磚</string>
+  <string name="screen_pinning_description_no_navbar">此功能會固定螢幕顯示直到您取消固定。觸控並長按 [返回] 鍵即可解除固定。</string>
+  <string name="quick_settings_custom_tile_detail_title">自訂圖塊</string>
+  <string name="quick_settings_remove">移除圖塊</string>
   <string name="quick_settings_network_adb_label">網路 ADB</string>
   <string name="quick_settings_compass_label">指南針</string>
   <string name="quick_settings_nfc_label">NFC</string>
@@ -92,25 +92,25 @@
   <string name="quick_settings_battery_saver_label_charging">省電模式 (充電中)</string>
   <string name="quick_settings_caffeine_label">暫停休眠</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_off">同步關閉</string>
+  <string name="accessibility_quick_settings_sync_off">同步處理關閉</string>
   <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_on">同步開啟</string>
+  <string name="accessibility_quick_settings_sync_on">同步處理開啟</string>
   <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_changed_off">同步已關閉</string>
+  <string name="accessibility_quick_settings_sync_changed_off">同步處理已關閉</string>
   <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_changed_on">同步已開啟</string>
-  <string name="quick_settings_sync_label">同步</string>
+  <string name="accessibility_quick_settings_sync_changed_on">同步處理已開啟</string>
+  <string name="quick_settings_sync_label">同步處理</string>
   <string name="quick_settings_volume_panel_label">音量面板</string>
   <string name="quick_settings_usb_tether_label">USB 網路共享</string>
   <string name="quick_settings_screen_timeout_detail_title">螢幕逾時</string>
-  <string name="quick_settings_lockscreen_label">鎖定螢幕</string>
+  <string name="quick_settings_lockscreen_label">鎖定畫面</string>
   <string name="quick_settings_ambient_display_label">環境顯示</string>
-  <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定螢幕</string>
+  <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定畫面</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">已由設定檔停用</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">螢幕逾時：<xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_screen_timeout_changed">螢幕逾時即可更改為 <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
+  <string name="accessibility_quick_settings_screen_timeout_changed">螢幕逾時即可變更為 <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
   <string name="qs_tile_performance">電池模式</string>
   <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">電池模式：省電模式。</string>
@@ -123,24 +123,24 @@
   <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">電池模式：快速模式。</string>
   <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">電池模式已更改為省電模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">電池模式已變更為省電模式。</string>
   <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bal">電池模式已更改為平衡模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">電池模式已變更為平衡模式。</string>
   <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_perf">電池模式已更改為高效能模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">電池模式已變更為高效能模式。</string>
   <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">電池模式已更改為效率模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">電池模式已變更為效率模式。</string>
   <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">電池模式已更改為快速模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">電池模式已變更為快速模式。</string>
   <string name="quick_settings_performance_profile_detail_title">電池模式</string>
   <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_off">鎖定螢幕關閉</string>
+  <string name="accessibility_quick_settings_lock_screen_off">鎖定畫面關閉</string>
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_on">鎖定螢幕開啟</string>
+  <string name="accessibility_quick_settings_lock_screen_on">鎖定畫面開啟</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_changed_off">鎖定螢幕已關閉</string>
+  <string name="accessibility_quick_settings_lock_screen_changed_off">鎖定畫面已關閉</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_changed_on">鎖定螢幕已開啟</string>
+  <string name="accessibility_quick_settings_lock_screen_changed_on">鎖定畫面已開啟</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">環境顯示關閉</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -170,40 +170,40 @@
   <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">省電模式已開啟</string>
   <!-- Dynamic tiles -->
-  <string name="quick_settings_dynamic_tile_detail_title">動態磚</string>
+  <string name="quick_settings_dynamic_tile_detail_title">動態圖塊</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
   <string name="dynamic_qs_tile_su_label">Root 權限</string>
   <string name="dynamic_qs_tile_themes_label">主題</string>
   <string name="quick_settings_title_advanced_location">三角定位</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_battery_saving">位置回報：節約耗電量</string>
+  <string name="accessibility_quick_settings_location_battery_saving">位置回報：省電模式。</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_gps_only">位置回報：僅限裝置</string>
+  <string name="accessibility_quick_settings_location_gps_only">位置回報：僅限感應器模式。</string>
   <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_high_accuracy">位置回報：高精確度</string>
+  <string name="accessibility_quick_settings_location_high_accuracy">位置回報：高精確度模式。</string>
   <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">定位模式</string>
   <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_location_battery_saving_label">節約耗電量</string>
+  <string name="quick_settings_location_battery_saving_label">省電模式</string>
   <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">僅限裝置</string>
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">高精確度</string>
   <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_battery_saving">位置回報已更改為省電模式。</string>
+  <string name="accessibility_quick_settings_location_changed_battery_saving">位置回報已變更為省電模式。</string>
   <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_gps_only">位置回報已更改為僅感應器模式。</string>
+  <string name="accessibility_quick_settings_location_changed_gps_only">位置回報已變更為僅限感應器模式。</string>
   <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">位置回報已更改為高精確度模式。</string>
-  <string name="quick_settings_tiles_category_system">系統瓷磚</string>
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">位置回報已變更為高精確度模式。</string>
+  <string name="quick_settings_tiles_category_system">系統圖塊</string>
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">新增瓷磚</string>
   <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">飛航模式啟用時無法連線行動網路，請停用飛航模式後再試一次。</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">手電筒已經開啟</string>
-  <string name="quick_settings_tile_flashlight_not_summary">點擊關閉</string>
+  <string name="quick_settings_tile_flashlight_not_summary">輕觸即可關閉</string>
   <!-- Wi-Fi hotspot label when enabled -->
   <plurals name="wifi_hotspot_connected_clients_label">
     <item quantity="other">%1$d 客戶端</item>
-- 
cgit v1.1