From 0e4f9e2f03e376f0816c1e653bf97fe1d0176794 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Fri, 28 Apr 2017 14:27:11 -0700
Subject: Automatic translation import

Change-Id: Ifeae1515729fc73ba3198e72b3479870092af3c1
---
 .../res/values-ast-rES/strings.xml                 |  28 +-
 .../res/values-ast-rES/strings.xml                 |   5 +-
 .../res/values-ast-rES/strings.xml                 |   2 +-
 .../DocumentsUI/res/values-ast-rES/strings.xml     |  42 +--
 .../FusedLocation/res/values-ast-rES/strings.xml   |   2 +-
 .../InputDevices/res/values-ast-rES/strings.xml    |  16 +-
 .../Keyguard/res/values-ast-rES/cm_strings.xml     |   8 +-
 packages/Keyguard/res/values-ast-rES/strings.xml   | 110 +------
 packages/Keyguard/res/values-en-rAU/cm_strings.xml |   6 +
 packages/Keyguard/res/values-sq-rAL/cm_strings.xml |   7 +
 packages/Keyguard/res/values-uk/cm_strings.xml     |   4 +-
 .../PrintSpooler/res/values-ast-rES/strings.xml    |  75 +----
 packages/SettingsLib/res/values-ast-rES/arrays.xml |  36 +-
 .../SettingsLib/res/values-ast-rES/cm_strings.xml  |   4 +-
 .../SettingsLib/res/values-ast-rES/strings.xml     |  77 +----
 .../SettingsLib/res/values-en-rAU/cm_strings.xml   |   8 +-
 packages/SettingsLib/res/values-ko/cm_strings.xml  |   2 +-
 .../SettingsLib/res/values-sq-rAL/cm_strings.xml   |   8 +-
 .../res/values-ast-rES/strings.xml                 |   2 +-
 packages/Shell/res/values-ast-rES/strings.xml      |   6 +-
 .../res/values-ast-rES/strings.xml                 |   2 +-
 packages/SystemUI/res/values-af/cm_strings.xml     |   1 +
 packages/SystemUI/res/values-ast-rES/cm_arrays.xml |   6 +-
 .../SystemUI/res/values-ast-rES/cm_strings.xml     |  62 ++--
 packages/SystemUI/res/values-ast-rES/strings.xml   | 365 ++++-----------------
 packages/SystemUI/res/values-bg/cm_strings.xml     |   4 +-
 packages/SystemUI/res/values-ca/cm_strings.xml     |   4 +-
 packages/SystemUI/res/values-en-rAU/cm_strings.xml |  94 ++++++
 packages/SystemUI/res/values-en-rGB/cm_strings.xml |   2 +-
 packages/SystemUI/res/values-en-rIN/cm_strings.xml |  19 ++
 packages/SystemUI/res/values-es-rUS/cm_strings.xml |  20 +-
 packages/SystemUI/res/values-fr/cm_strings.xml     |   5 +
 packages/SystemUI/res/values-in/cm_strings.xml     |   2 +-
 packages/SystemUI/res/values-ko/cm_strings.xml     |   7 +-
 packages/SystemUI/res/values-nb/cm_strings.xml     |  12 +-
 packages/SystemUI/res/values-sk/cm_strings.xml     |   6 +-
 packages/SystemUI/res/values-sq-rAL/cm_arrays.xml  |  18 +
 packages/SystemUI/res/values-sq-rAL/cm_strings.xml | 129 ++++++++
 packages/SystemUI/res/values-sv/cm_strings.xml     |   2 +
 packages/SystemUI/res/values-uk/cm_strings.xml     |  16 +-
 packages/SystemUI/res/values-zh-rCN/cm_strings.xml |   4 +-
 packages/SystemUI/res/values-zh-rTW/cm_strings.xml |   2 +-
 packages/VpnDialogs/res/values-ast-rES/strings.xml |  10 +-
 .../res/values-ast-rES/strings.xml                 |   2 +-
 44 files changed, 527 insertions(+), 715 deletions(-)

(limited to 'packages')

diff --git a/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml b/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
index 1e1bddf..4efd898 100644
--- a/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
@@ -16,43 +16,39 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Title of the activity when a full backup has been requested and must be confirmed -->
-  <string name="backup_confirm_title">Copia de seguranza completa</string>
+  <string name="backup_confirm_title">Respaldu completu</string>
   <!-- Title of the activity when a full restore has been requested and must be confirmed -->
   <string name="restore_confirm_title">Restauración completa</string>
   <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
-  <string name="backup_confirm_text">Solicitóse una copia de seguranza completa de tolos datos nun ordenador coneutáu. ¿Quies permitir la copia de seguranza?\n\nNun permitas la copia de seguranza si nun ficisti tu la solicitú.</string>
+  <string name="backup_confirm_text">Solicitóse un respaldu completu de tolos datos a un ordenador coneutáu. ¿Quies permitilo?\n\nSi nun solicitesti respaldu dalu, nun permitas la operación.</string>
   <!-- Button to allow a requested full backup to occur -->
-  <string name="allow_backup_button_label">Copia de seguranza de datos</string>
+  <string name="allow_backup_button_label">Respaldar los mios datos</string>
   <!-- Button to refuse to allow the requested full backup -->
-  <string name="deny_backup_button_label">Nun facer copia de seguranza</string>
+  <string name="deny_backup_button_label">Nun respaldar</string>
   <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
-  <string name="restore_confirm_text">Solicitóse una restauración completa de tolos datos dende un ordenador coneutáu. ¿Quies permitir la restauración?\n\nNun tienes de permitir la restauración si nun ficisti tu la solicitú. Van sustituyise los datos actuales del preséu!</string>
   <!-- Button to allow a requested full restore to occur -->
-  <string name="allow_restore_button_label">Restaurar datos</string>
+  <string name="allow_restore_button_label">Restaurar los mios datos</string>
   <!-- Button to refuse to allow the requested full restore -->
   <string name="deny_restore_button_label">Nun restaurar</string>
   <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
-  <string name="current_password_text">Introduz la contraseña actual de copia de seguranza:</string>
   <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
-  <string name="device_encryption_restore_text">Introduz la contraseña de cifráu del preséu.</string>
   <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
-  <string name="device_encryption_backup_text">Introduz la contraseña de cifráu del preséu. Esta contraseña va usase pa cifrar el ficheru de copia de seguranza.</string>
   <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
-  <string name="backup_enc_password_text">Introduz la contraseña que quieras usar pa cifrar los datos de la copia de seguranza completa. Si dexes esti campu baleru, va usase la to contraseña de copia de seguridá actual:</string>
+  <string name="backup_enc_password_text">Introduz una contraseña pa usar nel cifráu del respaldu completu. Si se dexa balero, usaráse la contraseña del to respaldu actual:</string>
   <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
-  <string name="backup_enc_password_optional">Si quies cifrar los datos de la copia de seguranza completa, introduz la contraseña a continuación:</string>
+  <string name="backup_enc_password_optional">Si desees cifrar los datos del respaldu completu, introduz embaxo la contraseña:</string>
   <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
-  <string name="backup_enc_password_required">Como\'l preséu ta cifráu, necesítase cifrar la copia de seguranza. Escribi la contraseña:</string>
+  <string name="backup_enc_password_required">Darréu que\'l preséu ta cifráu, ríquese que cifres el to respaldu. Introduz embaxo una contraseña:</string>
   <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
-  <string name="restore_enc_password_text">Si los datos de restauración tán cifraos, introduz la contraseña:</string>
+  <string name="restore_enc_password_text">Si los datos de restauración tán cifraos, introduz embaxo la contraseña:</string>
   <!-- Text of a toast telling the user that a full backup operation has begun -->
-  <string name="toast_backup_started">Aniciando copia de seguranza...</string>
+  <string name="toast_backup_started">Aniciando respaldu...</string>
   <!-- Text of a toast telling the user that a full backup operation has ended -->
-  <string name="toast_backup_ended">Finó la copia de seguridá</string>
+  <string name="toast_backup_ended">Finó\'l respaldu</string>
   <!-- Text of a toast telling the user that a full restore operation has begun -->
   <string name="toast_restore_started">Aniciando restauración...</string>
   <!-- Text of a toast telling the user that a full restore operation has ended -->
   <string name="toast_restore_ended">Finó la restauración</string>
   <!-- Text of a toast telling the user that the operation has timed out -->
-  <string name="toast_timeout">Tiempu d\'espera d\'operación escosáu</string>
+  <string name="toast_timeout">Escosó\'l tiempu d\'operación</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ast-rES/strings.xml b/packages/CaptivePortalLogin/res/values-ast-rES/strings.xml
index 9d7deaf..13478ef 100644
--- a/packages/CaptivePortalLogin/res/values-ast-rES/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ast-rES/strings.xml
@@ -5,7 +5,6 @@
   <string name="action_use_network">Usar esta rede tal cual</string>
   <string name="action_do_not_use_network">Nun usar esta rede</string>
   <string name="action_bar_label">Aniciar sesión na rede</string>
-  <string name="ssl_error_warning">La rede a la que intentes coneutate tien problemes de seguranza.</string>
-  <string name="ssl_error_example">Por exemplu, ye dable que la páxina d\'accesu nun perteneza a la organización que s\'amuesa.</string>
-  <string name="ssl_error_continue">Siguir de toes formes dende\'l restolador</string>
+  <string name="ssl_error_warning">La rede a la que tas tentando de xunite tien problemes de seguranza.</string>
+  <string name="ssl_error_continue">Siguir de toes toes pente\'l restolador</string>
 </resources>
diff --git a/packages/DefaultContainerService/res/values-ast-rES/strings.xml b/packages/DefaultContainerService/res/values-ast-rES/strings.xml
index 09c546f..8e496b4 100644
--- a/packages/DefaultContainerService/res/values-ast-rES/strings.xml
+++ b/packages/DefaultContainerService/res/values-ast-rES/strings.xml
@@ -20,5 +20,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- service name [CHAR LIMIT=25]  -->
-  <string name="service_name">Encontu d\'accesu a paquete</string>
+  <string name="service_name">Ayudante d\'accesu a paquetes</string>
 </resources>
diff --git a/packages/DocumentsUI/res/values-ast-rES/strings.xml b/packages/DocumentsUI/res/values-ast-rES/strings.xml
index a0ca39a..cb4e56b 100644
--- a/packages/DocumentsUI/res/values-ast-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-ast-rES/strings.xml
@@ -24,11 +24,11 @@
   <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
   <string name="menu_create_dir">Crear carpeta</string>
   <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
-  <string name="menu_grid">Vista de cuadrícula</string>
+  <string name="menu_grid">Vista de rexáu</string>
   <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
-  <string name="menu_list">Vista de llista</string>
+  <string name="menu_list">Vista de llistáu</string>
   <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
-  <string name="menu_sort">Ordenar por</string>
+  <string name="menu_sort">Ordenar per</string>
   <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
   <string name="menu_search">Guetar</string>
   <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
@@ -42,15 +42,13 @@
   <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">Desaniciar</string>
   <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
-  <string name="menu_select_all">Esbillalo too</string>
+  <string name="menu_select_all">Esbillar too</string>
   <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
   <string name="menu_copy">Copiar a\u2026</string>
   <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
-  <string name="menu_advanced_show" product="nosdcard">Amosar almac. internu</string>
   <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="default">Amosar tarxeta SD</string>
   <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
-  <string name="menu_advanced_hide" product="nosdcard">Anubrir almac. internu</string>
   <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_hide" product="default">Anubrir tarxeta SD</string>
   <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
@@ -58,29 +56,25 @@
   <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_hide">Anubrir tamañu de ficheru</string>
   <!-- Button label that select the current directory [CHAR LIMIT=24] -->
-  <string name="button_select">Seleicionar</string>
+  <string name="button_select">Esbillar</string>
   <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
   <string name="button_copy">Copiar</string>
   <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
-  <string name="sort_name">Por nome</string>
+  <string name="sort_name">Pel nome</string>
   <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
-  <string name="sort_date">Por data de modificación</string>
+  <string name="sort_date">Pela data de modificación</string>
   <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
-  <string name="sort_size">Por tamañu</string>
+  <string name="sort_size">Pel tamañu</string>
   <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
-  <string name="drawer_open">Amosar raíces</string>
   <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
-  <string name="drawer_close">Anubrir raíces</string>
   <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
-  <string name="save_error">Fallu al guardar documentu</string>
+  <string name="save_error">Fallu al guardar el documentu</string>
   <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
-  <string name="create_error">Fallu al crear carpeta</string>
+  <string name="create_error">Fallu al crear la carpeta</string>
   <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
-  <string name="query_error">Fallu al solicitar documentos</string>
+  <string name="query_error">Fallu al solicitar los documentos</string>
   <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
-  <string name="root_recent">Recién</string>
   <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
-  <string name="root_available_bytes"><xliff:g id="size" example="3GB">%1$s</xliff:g> d\'espaciu llibre</string>
   <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
   <string name="root_type_service">Servicios d\'almacenamientu</string>
   <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
@@ -88,33 +82,25 @@
   <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
   <string name="root_type_device">Preseos</string>
   <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
-  <string name="root_type_apps">Más apps</string>
+  <string name="root_type_apps">Más aplicaciones</string>
   <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
-  <string name="empty">Ensin elementos</string>
   <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
   <string name="toast_no_application">Nun pue abrise\'l ficheru</string>
   <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
-  <string name="toast_failed_delete">Nun pudieron desaniciase dalgunos documentos</string>
+  <string name="toast_failed_delete">Nun puen desaniciase dellos documentos</string>
   <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
-  <string name="share_via">Compartir per aciu de</string>
+  <string name="share_via">Compartir per</string>
   <!-- Title of the copy notification [CHAR LIMIT=24] -->
   <string name="copy_notification_title">Copiando ficheros</string>
   <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
-  <string name="copy_remaining">queden <xliff:g id="duration" example="3 minutes">%s</xliff:g></string>
   <!-- Toast shown when a file copy is kicked off -->
-  <plurals name="copy_begin">
-    <item quantity="one">Copiando <xliff:g id="count" example="1">%1$d</xliff:g> ficheru</item>
-    <item quantity="other">Copiando <xliff:g id="count" example="1">%1$d</xliff:g> ficheros</item>
-  </plurals>
   <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
-  <string name="copy_preparing">Tresnando pa copiar\u2026</string>
   <!-- Title of the copy error notification [CHAR LIMIT=48] -->
   <plurals name="copy_error_notification_title">
     <item quantity="one">Nun pudo copiase <xliff:g id="count" example="1">%1$d</xliff:g> ficheru</item>
     <item quantity="other">Nun pudieron copiase <xliff:g id="count" example="2">%1$d</xliff:g> ficheros</item>
   </plurals>
   <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
-  <string name="notification_touch_for_details">Toca pa ver detalles</string>
   <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
   <string name="retry">Reintentar</string>
   <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
diff --git a/packages/FusedLocation/res/values-ast-rES/strings.xml b/packages/FusedLocation/res/values-ast-rES/strings.xml
index e2ede7c..b446377 100644
--- a/packages/FusedLocation/res/values-ast-rES/strings.xml
+++ b/packages/FusedLocation/res/values-ast-rES/strings.xml
@@ -2,5 +2,5 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- Name of the application. [CHAR LIMIT=35] -->
-  <string name="app_label">Llocalización combinada</string>
+  <string name="app_label">Allugamientu combináu</string>
 </resources>
diff --git a/packages/InputDevices/res/values-ast-rES/strings.xml b/packages/InputDevices/res/values-ast-rES/strings.xml
index 6870a2a..68d6af6 100644
--- a/packages/InputDevices/res/values-ast-rES/strings.xml
+++ b/packages/InputDevices/res/values-ast-rES/strings.xml
@@ -6,15 +6,15 @@
   <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
   <string name="keyboard_layouts_label">Tecláu d\'Android</string>
   <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_uk_label">Inglés (UK)</string>
+  <string name="keyboard_layout_english_uk_label">Inglés (Reinu Xuníu)</string>
   <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_us_label">Inglés (US)</string>
+  <string name="keyboard_layout_english_us_label">Inglés (EE.XX)</string>
   <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_us_intl">Inglés (US), estilu International</string>
+  <string name="keyboard_layout_english_us_intl">Inglés (EE.XX), estilu Internacional</string>
   <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_us_colemak_label">Inglés (US), estilu Colemak</string>
+  <string name="keyboard_layout_english_us_colemak_label">Inglés (EE.XX), estilu Colemak</string>
   <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_us_dvorak_label">Inglés (US), estilu Dvorak</string>
+  <string name="keyboard_layout_english_us_dvorak_label">Inglés (EE.XX), estilu Dvorak</string>
   <!-- German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_german_label">Alemán</string>
   <!-- French keyboard layout label. [CHAR LIMIT=35] -->
@@ -30,7 +30,7 @@
   <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_french_label">Francés de Suiza</string>
   <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_swiss_german_label">Alemán suizu</string>
+  <string name="keyboard_layout_swiss_german_label">Alemán de Suiza</string>
   <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_belgian">Belga</string>
   <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
@@ -38,7 +38,7 @@
   <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_italian">Italianu</string>
   <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_danish">Danés</string>
+  <string name="keyboard_layout_danish">Neerlandés</string>
   <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_norwegian">Noruegu</string>
   <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
@@ -66,7 +66,7 @@
   <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_turkish">Turcu</string>
   <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_ukrainian">Ucrainianu</string>
+  <string name="keyboard_layout_ukrainian">Ucraín</string>
   <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_arabic">Árabe</string>
   <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
diff --git a/packages/Keyguard/res/values-ast-rES/cm_strings.xml b/packages/Keyguard/res/values-ast-rES/cm_strings.xml
index 5099baf..a440bcb 100644
--- a/packages/Keyguard/res/values-ast-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/cm_strings.xml
@@ -17,10 +17,14 @@
 -->
 <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">SIM/RUIM con bloquéu personal</string>
+  <string name="keyguard_perso_locked_message">La tarxeta SIM tien un bloquéu personalizáu</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Tarxeta inválida.</string>
+  <string name="lockscreen_sim_error_message_short">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">Introduz el PIN de la SIM, tienes <xliff:g id="number">%d</xliff:g> intentu restante enantes qu\'hebas contautar col to operador pa desbloquiar el to preséu.</item>
+    <item quantity="other">Introduz el PIN de la SIM, 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">Fallu: La entrada ye más curtia que\'l llargor mínimu</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ast-rES/strings.xml b/packages/Keyguard/res/values-ast-rES/strings.xml
index c268778..d76eedf 100644
--- a/packages/Keyguard/res/values-ast-rES/strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/strings.xml
@@ -20,149 +20,88 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- App label in the manifest  -->
-  <string name="app_name">Bloquéu</string>
   <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
          Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_pin_code">Inxerta\'l códigu PIN.</string>
   <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
          Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_puk_code">Escribi\'l PUK de la tarxeta SIM y un códigu PIN nuevu</string>
   <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <string name="keyguard_password_enter_puk_prompt">Códigu PUK de la tarxeta SIM</string>
   <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <string name="keyguard_password_enter_pin_prompt">Códigu nuevu PIN de tarxeta SIM</string>
   <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <string name="keyguard_password_entry_touch_hint"><font size="17">Toca pa introducir contraseña</font></string>
   <!-- Instructions telling the user to enter their text password to unlock the keyguard.
          Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_password_code">Inxerta la contraseña pa desbloquiar.</string>
   <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
          Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_pin_password_code">Inxerta\'l códigu PIN pa desbloquiar.</string>
   <!-- Instructions telling the user that they entered the wrong pin while trying
          to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <string name="keyguard_password_wrong_pin_code">Códigu PIN incorreutu</string>
   <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
          charged, say that it is charged. -->
-  <string name="keyguard_charged">Cargada</string>
   <!-- When the lock screen is showing and the phone plugged in, and the battery
          is not fully charged, say that it's charging.  -->
-  <string name="keyguard_plugged_in">Cargando</string>
   <!-- When the lock screen is showing and the phone plugged in, and the battery
          is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <string name="keyguard_plugged_in_charging_fast">Carga rápida</string>
   <!-- When the lock screen is showing and the phone plugged in, and the battery
          is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <string name="keyguard_plugged_in_charging_slowly">Carga lenta</string>
   <!-- When the lock screen is showing and the battery is low, warn user to plug
          in the phone soon. -->
-  <string name="keyguard_low_battery">Coneuta\'l cargador.</string>
   <!-- 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 -->
   <!-- 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. -->
-  <string name="keyguard_missing_sim_message_short">Falta la tarxeta SIM</string>
   <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message" product="tablet">Nun s\'inxertó nenguna tarxeta SIM na tablet.</string>
   <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message" product="default">Nun s\'inxertó nenguna tarxeta SIM nel teléfonu.</string>
   <!-- Shown to ask the user to insert a SIM card. -->
-  <string name="keyguard_missing_sim_instructions">Inxerta una tarxeta SIM.</string>
   <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <string name="keyguard_missing_sim_instructions_long">Falta la tarxeta SIM o nun pue lleese. Inxerta una tarxeta SIM.</string>
   <!-- Shown when SIM card is permanently disabled. -->
-  <string name="keyguard_permanent_disabled_sim_message_short">Tarxeta SIM inutilizable</string>
   <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <string name="keyguard_permanent_disabled_sim_instructions">La to tarxeta SIM inhabilitóse dafechu.\n Pa obtener otra, ponte en contautu col to fornidor de servicios de telefonía.</string>
   <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <string name="keyguard_sim_locked_message">La tarxeta SIM ta bloquiada.</string>
   <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <string name="keyguard_sim_puk_locked_message">La tarxeta SIM ta bloquiada col códigu PUK.</string>
   <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
          whether it is valid, and to unlock the sim if it is valid.  we display a
          progress dialog in the meantime.  this is the emssage. -->
-  <string name="keyguard_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM…</string>
   <!-- Time format strings for fall-back clock widget -->
   <!-- Time format strings for fall-back clock widget -->
-  <string name="keyguard_accessibility_pattern_unlock">Desbloquéu por patrón</string>
   <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pin_unlock">Desbloquéu por PIN</string>
   <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_password_unlock">Desbloquéu por contraseña</string>
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Área de patrón</string>
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_slide_area">Área pa eslizar</string>
   <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
   <!-- 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] -->
-  <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 -->
   <!-- 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] -->
-  <string name="keyboardview_keycode_enter">Intro</string>
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <string name="kg_forgot_pattern_button_text">¿Escaecisti\'l patrón?</string>
+  <string name="kg_forgot_pattern_button_text">Patrón escaecíu</string>
   <!-- Message shown when user enters wrong pattern -->
-  <string name="kg_wrong_pattern">El patrón ye incorreutu</string>
   <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">Contraseña incorreuta</string>
   <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">PIN incorreutu</string>
   <!-- Countdown message shown after too many failed unlock attempts -->
-  <string name="kg_too_many_failed_attempts_countdown">Inténtalo otra vegada en <xliff:g id="NUMBER">%d</xliff:g> segundos.</string>
   <!-- Instructions for using the pattern unlock screen -->
-  <string name="kg_pattern_instructions">Dibuxa\'l to patrón de desbloquéu.</string>
   <!-- Instructions for using the SIM PIN unlock screen -->
-  <string name="kg_sim_pin_instructions">Inxerta\'l PIN de la tarxeta SIM.</string>
   <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
   <!-- Instructions for using the PIN unlock screen -->
-  <string name="kg_pin_instructions">Inxerta\'l PIN.</string>
   <!-- Instructions for using the password unlock screen -->
-  <string name="kg_password_instructions">Escribi la contraseña.</string>
   <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <string name="kg_puk_enter_puk_hint">La tarxeta SIM ta inhabilitada. Pa continuar, inxerta\'l códigu PUK. Si quies más información, ponte en contautu col operador</string>
   <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
   <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <string name="kg_puk_enter_pin_hint">Inxerta\'l códigu PIN deseáu</string>
   <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <string name="kg_enter_confirm_pin_hint">Confirma\'l códigu PIN</string>
   <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <string name="kg_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM…</string>
+  <string name="kg_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM\u2026</string>
   <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <string name="kg_invalid_sim_pin_hint">Inxerta un códigu PIN con una llonxitú ente cuatro y ocho díxitos.</string>
   <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <string name="kg_invalid_sim_puk_hint">El códigu PUK tien de tener ocho númberos como mínimu.</string>
   <!-- Message shown when the user enters an invalid PUK code -->
-  <string name="kg_invalid_puk">Vuelvi a inxertar el códigu PUK correutu. Si inxertes un códigu incorreutu delles vegaes, va inhabilitase la tarxeta SIM.</string>
   <!-- String shown in PUK screen when PIN codes don't match -->
-  <string name="kg_invalid_confirm_pin_hint" product="default">Los códigos PIN nun concasen.</string>
+  <string name="kg_invalid_confirm_pin_hint" product="default">Los códigos PIN nun concasen</string>
   <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <string name="kg_login_too_many_attempts">Abondos intentos incorreutos de crear el patrón</string>
   <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <string name="kg_too_many_failed_pin_attempts_dialog_message">Inxertasti un códigu PIN incorreutu <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
   <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <string name="kg_too_many_failed_password_attempts_dialog_message">Inxertasti una contraseña incorreuta <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
-  <string name="kg_too_many_failed_pattern_attempts_dialog_message">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
   <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_almost_at_wipe" product="tablet">
-       Intentasti desbloquiar la tablet <xliff:g id="number">%d</xliff:g> vegaes.
-       Dempués de <xliff:g id="number">%d</xliff:g> intentos fallíos más,
-       esta tablet va resetease, desaniciando tolos sos datos.
-    </string>
   <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_almost_at_wipe" product="default">
-       Intentasti desbloquiar el teléfonu tablet <xliff:g id="number">%d</xliff:g> vegaes.
-       Dempués de <xliff:g id="number">%d</xliff:g> intentos fallíos más,
-       esta tablet va resetease, desaniciando tolos sos datos.</string>
   <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_now_wiping" product="tablet">
-       Intentasti desbloquiar la tablet <xliff:g id="number">%d</xliff:g> vegaes.
-       Esta tablet va resetease, desaniciando tolos sos datos.    </string>
   <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
   <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
   <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
@@ -174,75 +113,42 @@
   <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
   <!-- Message shown in dialog when user is almost at the limit where they will be
     locked out and may have to enter an alternate username/password to unlock the phone -->
-  <string name="kg_failed_attempts_almost_at_login" product="tablet">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tener d\'usar una cuenta de corréu-e pa desbloquiar la tablet.\n\n Inténtalo otra vegada en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</string>
   <!-- Message shown in dialog when user is almost at the limit where they will be
     locked out and may have to enter an alternate username/password to unlock the phone -->
-  <string name="kg_failed_attempts_almost_at_login" product="default">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tener d\'usar una cuenta de corréu-e pa desbloquiar el teléfonu.\n\n Inténtalo otra vegada en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</string>
   <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
          Displayed in a dialog box.  -->
-  <string name="kg_password_wrong_pin_code_pukked">Códigu PIN de la tarxeta SIM incorreutu. Tienes de contautar col to operador pa desbloquiar el preséu.</string>
   <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
          to unlock the keyguard.  Displayed in a dialog box.  -->
-  <plurals name="kg_password_wrong_pin_code">
-    <item quantity="one">Códigu PIN de la tarxeta SIM incorreutu. Queda <xliff:g id="NUMBER">%d</xliff:g> intentu pa tener que ponete en contautu col to operador pa desbloquiar el preséu.</item>
-    <item quantity="other">Códigu PIN de la tarxeta SIM incorreutu. Queden <xliff:g id="NUMBER">%d</xliff:g> intentos.</item>
-  </plurals>
   <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
          Displayed in a dialog box.  -->
-  <string name="kg_password_wrong_puk_code_dead">La tarxeta SIM nun pue usase. Ponte en contautu col to operador.</string>
   <!-- Instructions telling the user that they entered the wrong puk while trying
          to unlock the keyguard.  Displayed in a dialog box.  -->
-  <plurals name="kg_password_wrong_puk_code">
-    <item quantity="one">Códigu PUK de la tarxeta SIM incorreutu. Quédate <xliff:g id="NUMBER">%d</xliff:g> intentu pa que la tarxeta SIM nun pueda usase de mou permanente.</item>
-    <item quantity="other">Códigu PUK de la tarxeta SIM incorreutu. Quédente <xliff:g id="NUMBER">%d</xliff:g> intentos pa que la tarxeta SIM nun pueda usase de mou permanente.</item>
-  </plurals>
   <!-- Instructions telling the user that the operation to unlock the keyguard
          with SIM PIN failed. Displayed in one line in a large font.  -->
-  <string name="kg_password_pin_failed">Fallu al intentar desbloquiar la tarxeta SIM col códigu PIN</string>
   <!-- Instructions telling the user that the operation to unlock the keyguard
          with PUK failed. Displayed in one line in a large font.  -->
-  <string name="kg_password_puk_failed">Fallu al intentar desbloquiar la tarxeta SIM col códigu PUK</string>
   <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <string name="kg_pin_accepted">Códigu aceutáu</string>
+  <string name="kg_pin_accepted">¡Códigu aceutáu!</string>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.
         This is displayed if the phone is not connected to a carrier.-->
-  <string name="keyguard_carrier_default">Ensin serviciu</string>
+  <string name="keyguard_carrier_default">Ensin serviciu.</string>
   <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <!-- Description of airplane mode -->
   <string name="airplane_mode">Mou avión</string>
   <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_restart_pattern">Solicítase\'l patrón al reaniciar el preséu.</string>
   <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_restart_pin">Solicítase\'l PIN al reaniciar el preséu.</string>
   <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_restart_password">Solicítase la contraseña al reaniciar el preséu</string>
   <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_timeout_pattern">Solicítase\'l patrón por razones de seguridá.</string>
+  <string name="kg_prompt_reason_timeout_pattern">Ríquese\'l patrón pa más seguranza.</string>
   <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_timeout_pin">Por razones de seguridá solicítase\'l PIN.</string>
+  <string name="kg_prompt_reason_timeout_pin">Ríquese\'l PIN pa más seguranza.</string>
   <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_timeout_password">Por razones de seguridá, ingresa la contraseña.</string>
+  <string name="kg_prompt_reason_timeout_password">Ríquese la contraseña pa más seguranza.</string>
   <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_switch_profiles_pattern">Solicítase\'l patrón al camudar de perfil.</string>
   <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_switch_profiles_pin">Solicítase\'l PIN al camudar de perfil.</string>
   <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_switch_profiles_password">Solicítase la contraseña al camudar de perfil.</string>
   <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <plurals name="kg_prompt_reason_time_pattern">
-    <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma\'l patrón.</item>
-    <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma\'l patrón.</item>
-  </plurals>
   <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <plurals name="kg_prompt_reason_time_pin">
-    <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma\'l PIN.</item>
-    <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma\'l PIN.</item>
-  </plurals>
   <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <plurals name="kg_prompt_reason_time_password">
-    <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma la contraseña.</item>
-    <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma la contraseña.</item>
-  </plurals>
   <!-- Fingerprint hint message when finger was not recognized.-->
-  <string name="fingerprint_not_recognized">Non reconocío</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rAU/cm_strings.xml b/packages/Keyguard/res/values-en-rAU/cm_strings.xml
index 6261b2a..0fd0310 100644
--- a/packages/Keyguard/res/values-en-rAU/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rAU/cm_strings.xml
@@ -17,8 +17,14 @@
 -->
 <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">SIM card is Perso locked</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Invalid card.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
+    <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sq-rAL/cm_strings.xml b/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
index 0ba09aa..16ea787 100644
--- a/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
+++ b/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
@@ -17,7 +17,14 @@
 -->
 <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">Karta SIM ka bllokim Perso</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">Kartë e pavlefshme.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Vendosni kodin PIN të kartës SIM. Ju keni edhe <xliff:g id="number">%d</xliff:g> përpjekje të mbetur përpara se të detyroheni të kontaktoni operatorin për të zhbllokuar pajisjen.</item>
+    <item quantity="other">Vendosni kodin PIN të kartës SIM. Ju keni <xliff:g id="number">%d</xliff:g> përpjekje të mbetura përpara se të detyroheni të kontaktoni operatorin për të zhbllokuar pajisjen.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Gabim: Gjatësia e kodit të vendosur është më e shkurtër se gjatësia minimale</string>
 </resources>
diff --git a/packages/Keyguard/res/values-uk/cm_strings.xml b/packages/Keyguard/res/values-uk/cm_strings.xml
index 063a1c2..48f7c4e 100644
--- a/packages/Keyguard/res/values-uk/cm_strings.xml
+++ b/packages/Keyguard/res/values-uk/cm_strings.xml
@@ -19,7 +19,7 @@
   <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM-карта заблокована оператором</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Невірна картка.</string>
+  <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="one">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроба перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
@@ -27,5 +27,5 @@
     <item quantity="other">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроб перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
   </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Помилка: введено меньше мінімальної довжини</string>
+  <string name="kg_invalid_sim_length">Помилка: введено менше мінімальної довжини</string>
 </resources>
diff --git a/packages/PrintSpooler/res/values-ast-rES/strings.xml b/packages/PrintSpooler/res/values-ast-rES/strings.xml
index a6e8a9d..0003f13 100644
--- a/packages/PrintSpooler/res/values-ast-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-ast-rES/strings.xml
@@ -16,7 +16,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
-  <string name="app_label">Cola d\'impresión</string>
   <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
   <string name="more_options_button">Más opciones</string>
   <!-- Label of the destination widget. [CHAR LIMIT=20] -->
@@ -26,58 +25,39 @@
   <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
   <string name="label_copies_summary">Copies:</string>
   <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
-  <string name="label_paper_size">Tamañu papel</string>
   <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
-  <string name="label_paper_size_summary">Tamañu papel:</string>
   <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
   <string name="label_color">Color</string>
   <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
-  <string name="label_duplex">Dambos llaos</string>
   <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
-  <string name="label_orientation">Orientación</string>
   <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
   <string name="label_pages">Páxines</string>
   <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
-  <string name="template_all_pages">Too <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
   <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
   <string name="template_page_range">Rangu de <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
   <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
-  <string name="pages_range_example">ex. 1—5,8,11—13</string>
   <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
-  <string name="print_preview">Previsualizar impresión</string>
   <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
-  <string name="install_for_print_preview">Instalar visor PDF pa previsualizar</string>
   <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
-  <string name="printing_app_crashed">Falló l\'aplicación d\'impresión</string>
   <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
-  <string name="generating_print_job">Xenerando trabayu d\'impresión</string>
+  <string name="generating_print_job">Xenerando trabayu d\'imprentación</string>
   <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
   <string name="save_as_pdf">Guardar como PDF</string>
   <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
   <string name="all_printers">Toles imprentadores&#8230;</string>
   <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
-  <string name="print_dialog">Cuadru de diálogu d\'impresión</string>
+  <string name="print_dialog">Diálogu d\'imprentación</string>
   <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
-  <string name="current_page_template"><xliff:g id="current_page">%1$d</xliff:g>
-        /<xliff:g id="page_count">%2$d</xliff:g></string>
   <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
-  <string name="page_description_template">Páxina <xliff:g id="current_page" example="1">%1$d</xliff:g>
-        de <xliff:g id="page_count" example="100">%2$d</xliff:g></string>
   <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="summary_template">Resume, copies <xliff:g id="copies" example="1">%1$s</xliff:g>,
-        tamañu papel <xliff:g id="paper_size" example="A4">%2$s</xliff:g></string>
   <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="expand_handle">Remanar espansión</string>
   <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="collapse_handle">Remanar contraición</string>
   <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_button">Imprentar</string>
   <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="savetopdf_button">Guardar a PDF</string>
+  <string name="savetopdf_button">Guardar en PDF</string>
   <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="print_options_expanded">Opciones d\'imprentación espandíes</string>
   <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="print_options_collapsed">Opciones d\'imprentación contrayíes</string>
   <!-- Select printer activity -->
   <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
   <string name="search">Guetar</string>
@@ -86,75 +66,33 @@
   <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
   <string name="add_print_service_label">Amestar serviciu</string>
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
-  <string name="print_search_box_shown_utterance">Cuadru de gueta visible</string>
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
-  <string name="print_search_box_hidden_utterance">Cuadru de gueta anubríu</string>
   <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
-  <string name="print_add_printer">Amestar imprentadora</string>
   <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
-  <string name="print_select_printer">Esbillar imprentadora</string>
   <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
-  <string name="print_forget_printer">Esborrar imprentadora</string>
+  <string name="print_forget_printer">Escacer imprentadora</string>
   <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
-  <plurals name="print_search_result_count_utterance">
-    <item quantity="one">Atopóse <xliff:g id="count" example="1">%1$s</xliff:g> imprentadora</item>
-    <item quantity="other">Atopáronse <xliff:g id="count" example="2">%1$s</xliff:g> imprentadores</item>
-  </plurals>
   <!-- Add printer dialog  -->
   <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
-  <string name="choose_print_service">Elexir serviciu d\'impresión</string>
   <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
-  <string name="print_searching_for_printers">Guetando imprentadores</string>
   <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
-  <string name="print_no_printers">Nun s\'atoparon imprentadores</string>
   <!-- Notifications -->
   <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
-  <string name="printing_notification_title_template">Imprentando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
   <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
   <string name="cancelling_notification_title_template">Encaboxando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
   <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
-  <string name="failed_notification_title_template">Fallu d\'imprentadora <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
   <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
-  <string name="blocked_notification_title_template">La imprentadora bloquió <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
   <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
-  <plurals name="composite_notification_title_template">
-    <item quantity="one"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> trabayu d\'impresión</item>
-    <item quantity="other"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> trabayos d\'impresión</item>
-  </plurals>
   <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
   <string name="cancel">Encaboxar</string>
   <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
-  <string name="restart">Reaniciar</string>
   <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
-  <string name="no_connection_to_printer">Nun hai conexón cola imprentadora</string>
   <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
-  <string name="reason_unknown">desconocíu</string>
   <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
-  <string name="printer_unavailable"><xliff:g id="print_job_name" example="Canon-123GHT">%1$s</xliff:g> – non disponible</string>
   <!-- Arrays -->
   <!-- Color mode labels. -->
-  <string-array name="color_mode_labels">
-    <!-- Color mode label: Monochrome color scheme, e.g. one color is used. [CHAR LIMIT=20] -->
-    <item>Blancu y prietu</item>
-    <!-- Color mode label: Color color scheme, e.g. many colors are used. [CHAR LIMIT=20] -->
-    <item>Color</item>
-  </string-array>
   <!-- Duplex mode labels. -->
-  <string-array name="duplex_mode_labels">
-    <!-- Duplex mode label: No duplex supported. [CHAR LIMIT=20] -->
-    <item>Nengún</item>
-    <!-- Duplex mode label: Turn page sideways along the long edge like a book. [CHAR LIMIT=20] -->
-    <item>Borde llargu</item>
-    <!-- Duplex mode label: Turn page upwards along the short edge like a notepad. [CHAR LIMIT=20] -->
-    <item>Borde curtiu</item>
-  </string-array>
   <!-- Orientation labels. -->
-  <string-array name="orientation_labels">
-    <!-- Orientation label: Portrait page orientation. [CHAR LIMIT=30] -->
-    <item>Retratu</item>
-    <!-- Orientation label: Landscape page orientation [CHAR LIMIT=30] -->
-    <item>Paisaxe</item>
-  </string-array>
   <!-- Permissions -->
   <!-- Title of an application permission, listed so the user can choose whether they want
          to allow the application to do this. -->
@@ -166,14 +104,9 @@
          want to allow the application to do this. -->
   <!-- Error messages -->
   <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
-  <string name="print_write_error_message">Nun pudo escribise nel ficheru</string>
   <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
-  <string name="print_error_default_message">Nun funcionó. Inténtalo otra vegada.</string>
   <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
-  <string name="print_error_retry">Repitir</string>
   <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
-  <string name="print_error_printer_unavailable">La imprentadora nun ta disponible agora.</string>
   <!-- Long running operations -->
   <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
-  <string name="print_preparing_preview">Preparando previsualización\u2026</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/arrays.xml b/packages/SettingsLib/res/values-ast-rES/arrays.xml
index 1d95ab1..7fe82ef 100644
--- a/packages/SettingsLib/res/values-ast-rES/arrays.xml
+++ b/packages/SettingsLib/res/values-ast-rES/arrays.xml
@@ -26,27 +26,27 @@
     <!-- Status message of Wi-Fi when it is idle. -->
     <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
-    <item>Esplorando\u2026</item>
+    <item>Escaniando\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
     <item>Coneutando\u2026</item>
     <!-- Status message of Wi-Fi when it is authenticating. -->
     <item>Autenticando\u2026</item>
     <!-- Status message of Wi-Fi when it is obtaining IP address. -->
-    <item>Obteniendo la direición IP\u2026</item>
+    <item>Consiguiendo direición IP\u2026</item>
     <!-- Status message of Wi-Fi when it is connected. -->
-    <item>Coneutáu</item>
+    <item>Connected</item>
     <!-- Status message of Wi-Fi when it is suspended. -->
-    <item>Suspendíu</item>
+    <item>Suspended</item>
     <!-- Status message of Wi-Fi when it is disconnecting. -->
     <item>Desconeutando\u2026</item>
     <!-- Status message of Wi-Fi when it is disconnected. -->
-    <item>Desconeutáu</item>
+    <item>Disconnected</item>
     <!-- Status message of Wi-Fi when it is a failure. -->
-    <item>Incorreutu</item>
+    <item>Unsuccessful</item>
     <!-- Status message of Wi-Fi when it is blocked. -->
-    <item>Bloquiada</item>
+    <item>Blocked</item>
     <!-- Status message of Wi-Fi when connectiong is being verified. -->
-    <item>Desactivando mala conexón temporalmente</item>
+    <item>Evitando temporalmente conexón probe</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
   <!-- Wi-Fi settings. The status messages when the network is known. -->
@@ -54,26 +54,26 @@
     <!-- Status message of Wi-Fi when it is idle. -->
     <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
-    <item>Esplorando\u2026</item>
+    <item>Escaniando\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
-    <item>Coneutando a <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <item>Connecting to <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is authenticating with a network. -->
     <item>Autenticando con <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is obtaining IP address from a network. -->
-    <item>Obteniendo direición IP de <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <item>Consiguiendo direición IP de <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is connected to a network. -->
-    <item>Coneutáu a <xliff:g id="network_name">%1$s</xliff:g></item>
+    <item>Connected to <xliff:g id="network_name">%1$s</xliff:g></item>
     <!-- Status message of Wi-Fi when it is suspended. -->
-    <item>Suspendíu</item>
+    <item>Suspended</item>
     <!-- Status message of Wi-Fi when it is disconnecting from a network. -->
-    <item>Desconeutando de <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <item>Disconnecting from <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is disconnected. -->
-    <item>Desconeutáu</item>
+    <item>Disconnected</item>
     <!-- Status message of Wi-Fi when it is a failure. -->
-    <item>Incorreutu</item>
+    <item>Unsuccessful</item>
     <!-- Status message of Wi-Fi when it is blocked. -->
-    <item>Bloquiada</item>
+    <item>Blocked</item>
     <!-- Status message of Wi-Fi when connectiong is being verified. -->
-    <item>Desactivando mala conexón  temporalmente</item>
+    <item>Temporarily avoiding poor connection</item>
   </string-array>
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/cm_strings.xml b/packages/SettingsLib/res/values-ast-rES/cm_strings.xml
index a91e12f..3735e24 100644
--- a/packages/SettingsLib/res/values-ast-rES/cm_strings.xml
+++ b/packages/SettingsLib/res/values-ast-rES/cm_strings.xml
@@ -21,7 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="profile_applist_title">Aplicaciones</string>
   <string name="picker_activities">Actividaes</string>
-  <string name="select_custom_app_title">Esbilla d\'app personalizada</string>
-  <string name="select_custom_activity_title">Esbilla d\'app personalizada</string>
+  <string name="select_custom_app_title">Esbillar aplicación personalizada</string>
+  <string name="select_custom_activity_title">Esbillar actividá personalizada</string>
   <string name="lockscreen_targets_message">Atayos de pantalla de bloquéu</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/strings.xml b/packages/SettingsLib/res/values-ast-rES/strings.xml
index f1a1f88..0866760 100644
--- a/packages/SettingsLib/res/values-ast-rES/strings.xml
+++ b/packages/SettingsLib/res/values-ast-rES/strings.xml
@@ -20,7 +20,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Toast message when Wi-Fi cannot scan for networks -->
-  <string name="wifi_fail_to_scan">Nun puen buscase redes</string>
+  <string name="wifi_fail_to_scan">Nun puen escaniase redes</string>
   <!-- Do not translate.  Concise terminology for wifi with WEP security -->
   <string name="wifi_security_short_wep">WEP</string>
   <!-- Do not translate.  Concise terminology for wifi with WPA security -->
@@ -34,7 +34,6 @@
   <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
   <string name="wifi_security_short_eap">802.1x</string>
   <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
-  <string name="wifi_security_none">Nenguna</string>
   <!-- Do not translate.  Terminology for wifi with WEP security -->
   <string name="wifi_security_wep">WEP</string>
   <!-- Do not translate.  Terminology for wifi with WPA security -->
@@ -48,166 +47,104 @@
   <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
   <string name="wifi_security_eap">802.1x EAP</string>
   <!-- Do not translate.  Concise terminology for Passpoint network -->
-  <string name="wifi_security_passpoint">Passpoint</string>
   <!-- Summary for the remembered network. -->
-  <string name="wifi_remembered">Guardada</string>
   <!-- Status for networks disabled for unknown reason -->
-  <string name="wifi_disabled_generic">Deshabilitada</string>
   <!-- Status for networked disabled from a DNS or DHCP failure -->
-  <string name="wifi_disabled_network_failure">Fallu de configuración IP</string>
   <!-- Status for networked disabled from a wifi association failure -->
-  <string name="wifi_disabled_wifi_failure">Fallu de conexón Wi-Fi</string>
   <!-- Status for networks disabled from authentication failure (wrong password
          or certificate). -->
-  <string name="wifi_disabled_password_failure">Problema d\'autenticación</string>
   <!-- Summary for the remembered network but currently not in range. -->
-  <string name="wifi_not_in_range">Fuera d\'algame</string>
   <!-- Summary for the remembered network but no internet connection was detected. -->
-  <string name="wifi_no_internet">Nun se deteutó l\'accesu a Internet. Nun va volver a coneutase de mou automáticu.</string>
   <!-- Summary for saved networks -->
-  <string name="saved_network">Guardada por <xliff:g id="name">%1$s</xliff:g></string>
   <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
-  <string name="connected_via_wfa">Coneutáu por asistente de Wi-Fi</string>
   <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
-  <string name="connected_via_passpoint">Conexón al traviés de %1$s</string>
   <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
-  <string name="available_via_passpoint">Disponible al traviés de %1$s</string>
+  <string name="available_via_passpoint">Disponible per %1$s</string>
   <!-- Package name for Settings app-->
   <!-- Package name for Certinstaller app-->
   <!-- Summary for Connected wifi network without internet -->
-  <string name="wifi_connected_no_internet">Conectáu, ensin Internet</string>
   <!-- Bluetooth settings.  Message when a device is disconnected -->
-  <string name="bluetooth_disconnected">Desconeutáu</string>
   <!-- Bluetooth settings.  Message when disconnecting from a device -->
   <string name="bluetooth_disconnecting">Desconeutando\u2026</string>
   <!-- Bluetooth settings.  Message when connecting to a device -->
   <string name="bluetooth_connecting">Coneutando\u2026</string>
   <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected">Coneutáu</string>
   <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
-  <string name="bluetooth_pairing">Enllazando\u2026</string>
+  <string name="bluetooth_pairing">Empareyando\u2026</string>
   <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected_no_headset">Coneutáu (ensin tfnu)</string>
   <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected_no_a2dp">Coneutáu (ensin multimedia)</string>
   <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected_no_map">Coneutáu (ensin accesu a mensaxes)</string>
   <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected_no_headset_no_a2dp">Coneutáu (ensin tel. nin multimedia)</string>
   <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
-  <string name="bluetooth_profile_a2dp">Audiu multimedia</string>
   <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
-  <string name="bluetooth_profile_headset">Audiu del preséu</string>
+  <string name="bluetooth_profile_headset">Audiu del teléfonu</string>
   <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
   <string name="bluetooth_profile_opp">Tresferencia de ficheros</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
   <string name="bluetooth_profile_hid">Preséu d\'entrada</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
-  <string name="bluetooth_profile_pan">Accesu a Internet</string>
+  <string name="bluetooth_profile_pan">Accesu a internet</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
-  <string name="bluetooth_profile_pbap">Compartir contautos</string>
   <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
-  <string name="bluetooth_profile_pbap_summary">Usar pa compartir contautos</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
-  <string name="bluetooth_profile_pan_nap">Compartir conexón d\'internet</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
   <string name="bluetooth_profile_map">Accesu a mensaxes</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
-  <string name="bluetooth_profile_sap">Accesu SIM</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
-  <string name="bluetooth_profile_dun">Accesu telefónicu a redes</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
-  <string name="bluetooth_a2dp_profile_summary_connected">Conectáu al audiu multimedia</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
-  <string name="bluetooth_headset_profile_summary_connected">Conectáu al audiu del preséu</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
-  <string name="bluetooth_opp_profile_summary_connected">Coneutáu al sirvidor de tresferencia de ficheros</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
-  <string name="bluetooth_map_profile_summary_connected">Coneutáu a mapa</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
-  <string name="bluetooth_sap_profile_summary_connected">Coneutáu a SAP</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
-  <string name="bluetooth_opp_profile_summary_not_connected">Ensin conexón col sirvidor de tresferencia de ficheros</string>
   <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
-  <string name="bluetooth_hid_profile_summary_connected">Coneutáu a preséu d\'entrada</string>
   <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
-  <string name="bluetooth_pan_user_profile_summary_connected">Coneutáu a preséu p\'accesu a Internet</string>
   <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
-  <string name="bluetooth_pan_nap_profile_summary_connected">Compartiendo conexón a Internet col preséu</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
-  <string name="bluetooth_dun_profile_summary_connected">Coneutáu al sirvidor DUN</string>
   <!-- Bluetooth settings. Connection options screen. The summary
          for the PAN checkbox preference that describes how checking it
          will set the PAN profile as preferred. -->
-  <string name="bluetooth_pan_profile_summary_use_for">Usar p\'acceder a Internet</string>
   <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
-  <string name="bluetooth_map_profile_summary_use_for">Usar pa mapa</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
-  <string name="bluetooth_sap_profile_summary_use_for">Usar p\'accesu a SIM</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
-  <string name="bluetooth_a2dp_profile_summary_use_for">Usar p\'audiu de mediu</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
-  <string name="bluetooth_headset_profile_summary_use_for">Usar p\'audiu del teléfonu</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
-  <string name="bluetooth_opp_profile_summary_use_for">Usu de la tresferencia de ficheros</string>
   <!-- Bluetooth settings. Connection options screen. The summary
          for the HID checkbox preference that describes how checking it
          will set the HID profile as preferred. -->
-  <string name="bluetooth_hid_profile_summary_use_for">Usar pa entrada</string>
   <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
-  <string name="bluetooth_dun_profile_summary_use_for">Usáu pal accesu telefónicu a redes</string>
   <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
-  <string name="bluetooth_pairing_accept">Enllazar</string>
   <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
-  <string name="bluetooth_pairing_accept_all_caps">ENLLAZAR</string>
+  <string name="bluetooth_pairing_accept_all_caps">EMPAREYAR</string>
   <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
   <string name="bluetooth_pairing_decline">Encaboxar</string>
   <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
-  <string name="bluetooth_pairing_will_share_phonebook">La vinculación permite acceder a los contautos y al historial de llamaes cuando\'l preséu ta coneutáu.</string>
   <!-- Message for the error dialog when BT pairing fails generically. -->
-  <string name="bluetooth_pairing_error_message">Nun pudo enllazase con <xliff:g id="device_name">%1$s</xliff:g>.</string>
   <!-- Message for the error dialog when BT pairing fails because the PIN /
     Passkey entered is incorrect. -->
-  <string name="bluetooth_pairing_pin_error_message">Nun pudo enllazase con <xliff:g id="device_name">%1$s</xliff:g> porque la clave d\'accesu o el PIN son incorreutos.</string>
   <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
-  <string name="bluetooth_pairing_device_down_error_message">Nun pue afitase comunicación con <xliff:g id="device_name">%1$s</xliff:g>.</string>
   <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
-  <string name="bluetooth_pairing_rejected_error_message">Enllaz refugáu por <xliff:g id="device_name">%1$s</xliff:g></string>
   <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_off">Wi-Fi desactiváu</string>
   <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_no_wifi">Wi-Fi desconeutáu</string>
   <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_one_bar">Una barra de Wi-Fi</string>
   <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_two_bars">Dos barres de Wi-Fi</string>
   <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_three_bars">Trés barres de Wi-Fi</string>
   <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_signal_full">Señal de Wi-Fi al máximu</string>
   <!-- Label for kernel threads in battery usage -->
-  <string name="process_kernel_label">Android OS</string>
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
-  <string name="data_usage_uninstalled_apps">Aplicaciones desaniciaes</string>
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
-  <string name="data_usage_uninstalled_apps_users">Usuarios y aplicaciones desaniciaos</string>
   <!-- Tethering controls, item title to go into the tethering settings -->
   <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_usb">Anclaxe de USB</string>
   <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_wifi">Zona Wi-Fi portátil</string>
   <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_bluetooth">Anclaxe de Bluetooth</string>
   <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_usb_bluetooth">Anclaxe a rede</string>
+  <string name="tether_settings_title_usb_bluetooth">Tethering</string>
   <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_all">Anclaxe a rede y zona Wi-Fi</string>
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <string name="managed_user_title">Perfil de trabayu</string>
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <string name="user_guest">Convidáu</string>
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
-  <string name="unknown">Desconocíu</string>
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <string name="running_process_item_user_label">Usuariu: <xliff:g id="user_name">%1$s</xliff:g></string>
 </resources>
diff --git a/packages/SettingsLib/res/values-en-rAU/cm_strings.xml b/packages/SettingsLib/res/values-en-rAU/cm_strings.xml
index 220d5f5..b311b85 100644
--- a/packages/SettingsLib/res/values-en-rAU/cm_strings.xml
+++ b/packages/SettingsLib/res/values-en-rAU/cm_strings.xml
@@ -18,4 +18,10 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Apps</string>
+  <string name="picker_activities">Activities</string>
+  <string name="select_custom_app_title">Select custom app</string>
+  <string name="select_custom_activity_title">Select custom activity</string>
+  <string name="lockscreen_targets_message">Lock screen shortcuts</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ko/cm_strings.xml b/packages/SettingsLib/res/values-ko/cm_strings.xml
index 9669798..6a0df78 100644
--- a/packages/SettingsLib/res/values-ko/cm_strings.xml
+++ b/packages/SettingsLib/res/values-ko/cm_strings.xml
@@ -19,7 +19,7 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="profile_applist_title">애플리케이션</string>
+  <string name="profile_applist_title">앱</string>
   <string name="picker_activities">액티비티</string>
   <string name="select_custom_app_title">사용자 정의 앱 선택</string>
   <string name="select_custom_activity_title">사용자 정의 액티비티 선택</string>
diff --git a/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml b/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
index 220d5f5..f4b4958 100644
--- a/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
+++ b/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
@@ -18,4 +18,10 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikacionet</string>
+  <string name="picker_activities">Aktivitete</string>
+  <string name="select_custom_app_title">Zgjidh një aplikacion të personalizuar</string>
+  <string name="select_custom_activity_title">Zgjidh një aktivitet të personalizuar</string>
+  <string name="lockscreen_targets_message">Shkurtoret e ekranit bllokues</string>
+</resources>
diff --git a/packages/SettingsProvider/res/values-ast-rES/strings.xml b/packages/SettingsProvider/res/values-ast-rES/strings.xml
index fa15ee4..01de760 100644
--- a/packages/SettingsProvider/res/values-ast-rES/strings.xml
+++ b/packages/SettingsProvider/res/values-ast-rES/strings.xml
@@ -19,5 +19,5 @@
 -->
 <resources>
   <!-- Name of the activity for Settings storage. -->
-  <string name="app_label">Axustes d\'almacenamientu</string>
+  <string name="app_label">Almacenamientu d\'axustes</string>
 </resources>
diff --git a/packages/Shell/res/values-ast-rES/strings.xml b/packages/Shell/res/values-ast-rES/strings.xml
index 829ce93..1a77d2c 100644
--- a/packages/Shell/res/values-ast-rES/strings.xml
+++ b/packages/Shell/res/values-ast-rES/strings.xml
@@ -17,13 +17,11 @@
 <resources>
   <string name="app_label">Shell</string>
   <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
-  <string name="bugreport_finished_title">Informe de fallu capturáu</string>
+  <string name="bugreport_finished_title">Capturóse l\'informe de fallu</string>
   <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
-  <string name="bugreport_finished_text" product="watch">Esliza a esquierda pa compartir l\'informe de fallu</string>
   <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
-  <string name="bugreport_finished_text" product="default">Toca pa compartir l\'informe de fallu</string>
   <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
-  <string name="bugreport_confirm">Los informes de fallos contienen datos de los distintos ficheros de rexistru del sistema, incluyida información personal y privada. Comparte los informes de fallos namái con aplicaciones y usuarios nos que confíes.</string>
+  <string name="bugreport_confirm">Los informes de fallu contienen datos de dellos ficheros de rexistru del sistema, incluyendo información personal y privada. Comparti los informes de fallu namái con aplicaciones y usuarios nos que t\'enfotes.</string>
   <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
   <string name="bugreport_confirm_repeat">Amosar esti mensaxe la próxima vegada</string>
   <!-- Title for documents backend that offers bugreports. -->
diff --git a/packages/StatementService/res/values-ast-rES/strings.xml b/packages/StatementService/res/values-ast-rES/strings.xml
index dcf9f6e..3ec1e08 100644
--- a/packages/StatementService/res/values-ast-rES/strings.xml
+++ b/packages/StatementService/res/values-ast-rES/strings.xml
@@ -15,5 +15,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="service_name">Serviciu de verificación d\'Intención de filtru</string>
+  <string name="service_name">Serviciu de verificación d\'intentu de peñera</string>
 </resources>
diff --git a/packages/SystemUI/res/values-af/cm_strings.xml b/packages/SystemUI/res/values-af/cm_strings.xml
index 823e9b3..7cab992 100644
--- a/packages/SystemUI/res/values-af/cm_strings.xml
+++ b/packages/SystemUI/res/values-af/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Volgende alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Kies IME</string>
   <string name="dynamic_qs_tile_su_label">\'Root\' toegang</string>
+  <string name="dynamic_qs_tile_themes_label">Temas</string>
   <string name="quick_settings_title_advanced_location">Drie-staat ligging</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">Liggingverslaggewing: battery besparing.</string>
diff --git a/packages/SystemUI/res/values-ast-rES/cm_arrays.xml b/packages/SystemUI/res/values-ast-rES/cm_arrays.xml
index 3110756..85897e7 100644
--- a/packages/SystemUI/res/values-ast-rES/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ast-rES/cm_arrays.xml
@@ -28,11 +28,11 @@
     <!-- South east -->
     <item>S</item>
     <!-- South -->
-    <item>SW</item>
+    <item>SO</item>
     <!-- South west -->
-    <item>W</item>
+    <item>O</item>
     <!-- West -->
-    <item>NW</item>
+    <item>NO</item>
     <!-- North west -->
   </string-array>
   <!-- Performance profiles description-->
diff --git a/packages/SystemUI/res/values-ast-rES/cm_strings.xml b/packages/SystemUI/res/values-ast-rES/cm_strings.xml
index e530151..f93c572 100644
--- a/packages/SystemUI/res/values-ast-rES/cm_strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/cm_strings.xml
@@ -31,14 +31,14 @@
   <string name="right_shortcut_hint">Esliza a la esquierda pa %1$s</string>
   <string name="lockscreen_message">Toca nun iconu de la esquierda o derecha pa reasignar un atayu na pantalla de bloquéu.</string>
   <string name="lockscreen_default_target">Por defeutu</string>
-  <string name="select_application">Esbillar app</string>
-  <string name="lockscreen_choose_action_title">Esbillar aición</string>
+  <string name="select_application">Esbillar aplicación</string>
+  <string name="lockscreen_choose_action_title">Escoyer aición</string>
   <string name="lockscreen_none_target">Nengún</string>
   <!-- Dialog title for navigation bar button selection -->
-  <string name="navbar_dialog_title">Seleicionar botón a amosar</string>
+  <string name="navbar_dialog_title">Escoyer aición p\'asignar</string>
   <string name="navbar_home_button">Botón Aniciu</string>
   <string name="navbar_recent_button">Botón Recientes</string>
-  <string name="navbar_search_button">Botón Gueta</string>
+  <string name="navbar_search_button">Botón Guetar</string>
   <string name="navbar_back_button">Botón Atrás</string>
   <string name="navbar_empty_button">Botón baleru</string>
   <string name="navbar_menu_conditional_button">Botón Menú (auto-anubrir)</string>
@@ -48,13 +48,13 @@
   <string name="accessibility_dpad_right">Cursor derecha</string>
   <!-- Development shortcuts -->
   <!-- Title shown in recents popup for wiping application's data -->
-  <string name="advanced_dev_option_wipe_app">Desaniciar datos</string>
+  <string name="advanced_dev_option_wipe_app">Llimpiar datos d\'aplicaciones</string>
   <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Forciar detención</string>
   <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstalar</string>
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_notification_brightness">Rellumu de lluz</string>
+  <string name="accessibility_notification_brightness">Brilléu de lluz</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">Perfiles desactivaos.</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -63,7 +63,7 @@
   <string name="accessibility_quick_settings_profiles_changed_off">Perfiles desactivaos.</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Perfil camudáu a <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
-  <string name="quick_settings_compass_init">Anicializando\u2026</string>
+  <string name="quick_settings_compass_init">Aniciando\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Axustes de lluz</string>
   <string name="led_notification_text">Lluz LED habilitada polos axustes</string>
@@ -73,9 +73,9 @@
   <string name="qs_tiles_reset_confirmation">¿Restaurar los controles d\'axustes rápidos a la configuración predeterminada?</string>
   <string name="quick_settings_tile_reset_to_default">Reafitar distribución</string>
   <string name="quick_settings_title_header">Testera</string>
-  <string name="quick_settings_title_tiles">Controles</string>
+  <string name="quick_settings_title_tiles">Caxelles</string>
   <string name="quick_settings_title_show_weather">Amosar clima</string>
-  <string name="quick_settings_title_show_brightness_slider">Amosar barra de lluminosidá</string>
+  <string name="quick_settings_title_show_brightness_slider">Amosar eslizador de brilléu</string>
   <string name="quick_settings_title_enlarge_first_row">Ampliar la primer filera</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Esto caltién la pantalla nesta vista hasta que se llibera. Caltén primíu\'l botón Atrás pa lliberala.</string>
@@ -86,8 +86,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Perfiles del sistema</string>
   <string name="quick_settings_profiles_off">Perfiles deshabilitaos</string>
-  <string name="quick_settings_heads_up_label">Notificaciones emerxentes</string>
-  <string name="quick_settings_battery_saver_label">Aforrador d\'enerxía</string>
+  <string name="quick_settings_heads_up_label">Avisos emerxente</string>
+  <string name="quick_settings_battery_saver_label">Aforrador de batería</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
   <string name="quick_settings_battery_saver_label_charging">Aforrador de batería (cargando)</string>
   <string name="quick_settings_caffeine_label">Cafeína</string>
@@ -101,25 +101,25 @@
   <string name="accessibility_quick_settings_sync_changed_on">Sincronización activada.</string>
   <string name="quick_settings_sync_label">Sincronización</string>
   <string name="quick_settings_volume_panel_label">Panel de volume</string>
-  <string name="quick_settings_usb_tether_label">USB tethering</string>
-  <string name="quick_settings_screen_timeout_detail_title">Tiempu d\'espera</string>
+  <string name="quick_settings_usb_tether_label">Tethering USB</string>
+  <string name="quick_settings_screen_timeout_detail_title">Escosa de tiempu</string>
   <string name="quick_settings_lockscreen_label">Pantalla de bloquéu</string>
   <string name="quick_settings_ambient_display_label">Pantalla ambiente</string>
   <string name="quick_settings_lockscreen_label_enforced">Bloquéu de pantalla forzáu</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Deshabilitáu por perfil</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">Tiempu d\'espera de pantalla: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <string name="accessibility_quick_settings_screen_timeout">Tiempu d\'escosa de pantalla: <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">Tiempu d\'espera de pantalla camudáu a <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <string name="accessibility_quick_settings_screen_timeout_changed">Camudóse\'l tiempu d\'escosa de pantalla a <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Mou de batería</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">Mou de batería: mou d\'aforru d\'enerxía.</string>
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">Mou de batería: aforru d\'enerxía.</string>
   <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_bal">Mou de batería: mou balanceáu.</string>
+  <string name="accessibility_quick_settings_perf_profile_bal">Mou de batería: balanceáu.</string>
   <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_perf">Mou de batería: mou rindimientu.</string>
+  <string name="accessibility_quick_settings_perf_profile_perf">Mou de batería: rindimientu.</string>
   <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_bias_power">Mou de batería: mou eficiente.</string>
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Mou de batería: eficiencia.</string>
   <!-- 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">Mou batería: mou rápidu.</string>
   <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -142,13 +142,13 @@
   <!-- 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">Bloquéu de pantalla activáu.</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">Pantalla ambiente apagada.</string>
+  <string name="accessibility_quick_settings_ambient_display_off">Pantalla ambiente activada.</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">Pantalla ambiente prendida.</string>
+  <string name="accessibility_quick_settings_ambient_display_on">Pantalla ambiente desactivada.</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">Apagóse la pantalla ambiente.</string>
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Desactivóse la pantalla ambiente.</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">Prendióse la pantalla ambiente.</string>
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Activóse la pantalla ambiente.</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">Desactivar notificaciones emerxentes.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -162,18 +162,15 @@
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Activar Cafeína.</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_battery_saver_off">Aforru de bateríu apagáu.</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_battery_saver_on">Aforru de bateríu encesu.</string>
   <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_battery_saver_changed_off">Aforru de bateríu apagáu.</string>
   <!-- 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">Aforru de bateríu encesu.</string>
   <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Caxella dinámica</string>
   <string name="dynamic_qs_tile_next_alarm_label">Alarma siguiente</string>
   <string name="dynamic_qs_tile_ime_selector_label">Seleutor d\'IME</string>
   <string name="dynamic_qs_tile_su_label">Accesu root</string>
+  <string name="dynamic_qs_tile_themes_label">Temes</string>
   <string name="quick_settings_title_advanced_location">Llocalización por triangulación</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">Informes de llocalización: mou d\'aforru de batería.</string>
@@ -182,7 +179,7 @@
   <!-- 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">Informes de llocalización: mou d\'alta precisión.</string>
   <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_location_detail_title">Mou de llocalización</string>
+  <string name="quick_settings_location_detail_title">Mou d\'allugamientu</string>
   <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Aforru d\'enerxía</string>
   <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
@@ -195,14 +192,14 @@
   <string name="accessibility_quick_settings_location_changed_gps_only">Informes de llocalización camudaron a mou namái preséu.</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">Informes de llocalización camudaron a mou d\'alta precisión.</string>
-  <string name="quick_settings_tiles_category_system">Controles del sistema</string>
+  <string name="quick_settings_tiles_category_system">Caxelles del sistema</string>
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Amestar un control</string>
   <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Nun pue coneutase a redes móviles mentanto tea activáu el mou Avión. Desactiva\'l mou Avión ya inténtalo de nueves.</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">La llinterna ta encesa</string>
-  <string name="quick_settings_tile_flashlight_not_summary">Toca p\'apagala</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Calca p\'apagala</string>
   <!-- Wi-Fi hotspot label when enabled -->
   <plurals name="wifi_hotspot_connected_clients_label">
     <item quantity="one">%1$d veceru</item>
@@ -218,5 +215,8 @@
   <!-- 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="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">Eslizar hacia abaxo pa espander</string>
+  <string name="swipe_left_hint">Eslizar a la izquierda pa <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Eslizar a la drecha p\'avisos</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ast-rES/strings.xml b/packages/SystemUI/res/values-ast-rES/strings.xml
index 3b9cdb0..f9bf2c7 100644
--- a/packages/SystemUI/res/values-ast-rES/strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/strings.xml
@@ -24,33 +24,23 @@
          all of the currently visible notifications. [CHAR LIMIT=10]-->
   <string name="status_bar_clear_all_button">Llimpiar</string>
   <!-- Title shown in recents popup for removing an application from the list -->
-  <string name="status_bar_recent_remove_item_title">Desaniciar de la llista</string>
   <!-- Title shown in recents popup for inspecting an application's properties -->
-  <string name="status_bar_recent_inspect_item_title">Información de l\'aplicación</string>
   <!-- Message shown in the middle of the screen after clicking on the recent apps button
          when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
-  <string name="status_bar_no_recent_apps">Les tos pantalles recientes apaecen equí</string>
   <!-- Content description for the button to dismiss Recent Apps (only present on large
          devices) -->
-  <string name="status_bar_accessibility_dismiss_recents">Inorar aplicaciones recientes</string>
   <!-- Message that is read when you enter recent apps in TalkBack -->
-  <plurals name="status_bar_accessibility_recent_apps">
-    <item quantity="one">1 pantalla en perspeutiva</item>
-    <item quantity="other">%d pantalles en perspeutiva</item>
-  </plurals>
   <!-- The label in the bar at the top of the status bar when there are no notifications
          showing.  [CHAR LIMIT=40]-->
-  <string name="status_bar_no_notifications_title">Nun tienes notificaciones</string>
+  <string name="status_bar_no_notifications_title">Nun hai avisos</string>
   <!-- The label for the group of notifications for ongoing events in the opened version of
          the status bar.  An ongoing call is the prime example of this.  The MP3 music player
          might be another example.   [CHAR LIMIT=40] -->
-  <string name="status_bar_ongoing_events_title">Entrante</string>
   <!-- The label for the group of notifications for recent events in the opened version of
          the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
          [CHAR LIMIT=40] -->
-  <string name="status_bar_latest_events_title">Notificaciones</string>
+  <string name="status_bar_latest_events_title">Avisos</string>
   <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
-  <string name="battery_low_title">Batería baxa</string>
   <!-- A message that appears when the battery level is getting low in a dialog.  This is
         appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
         remaining [CHAR LIMIT=none]-->
@@ -59,95 +49,62 @@
     support charging on it.  That is, a charger that fits into the USB port and goes into
     a wall socket, not into a computer. (This happens because some devices require more
     current than the USB spec allows.  [CHAR LIMIT=NONE] -->
-  <string name="invalid_charger">Nun s\'almite la carga por USB.\nUsa namái el cargador proporcionáu.</string>
   <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
-  <string name="invalid_charger_title">La carga USB nun ta sofitada.</string>
   <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
-  <string name="invalid_charger_text">Usar namái el cargador suministráu.</string>
   <!-- When the battery is low, this is the label of the button to go to the
          power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
   <string name="battery_low_why">Axustes</string>
   <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
-  <string name="battery_saver_confirmation_title">¿Prender l\'aforrador d\'enerxía?</string>
+  <string name="battery_saver_confirmation_title">¿Activar l\'aforrador de batería?</string>
   <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
-  <string name="battery_saver_confirmation_ok">Activar</string>
   <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
-  <string name="battery_saver_start_action">Prender l\'aforrador d\'enerxía</string>
   <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_settings_button">Axustes</string>
   <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_wifi_button">Wi-Fi</string>
   <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
-  <string name="status_bar_settings_auto_rotation">Xirar pantalla automáticamente</string>
+  <string name="status_bar_settings_auto_rotation">Auto-voltiar pantalla</string>
   <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
-  <string name="status_bar_settings_mute_label">SILENC</string>
   <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
-  <string name="status_bar_settings_auto_brightness_label">AUTO</string>
   <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
-  <string name="status_bar_settings_notifications">Notificaciones</string>
+  <string name="status_bar_settings_notifications">Avisos</string>
   <!-- Separator for PLMN and SPN in network name. -->
   <!-- Network connection string for Bluetooth Reverse Tethering -->
-  <string name="bluetooth_tethered">Bluetooth ancláu</string>
   <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
-  <string name="status_bar_input_method_settings_configure_input_methods">Configurar métodos d\'entrada</string>
   <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
   <string name="status_bar_use_physical_keyboard">Tecláu físicu</string>
   <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
-  <string name="usb_device_permission_prompt">¿Permitir que l\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> acceda al preséu USB?</string>
   <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
-  <string name="usb_accessory_permission_prompt">¿Permitir que l\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> acceda al preséu USB?</string>
   <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
-  <string name="usb_device_confirm_prompt">¿Quies abrir <xliff:g id="ACTIVITY">%1$s</xliff:g> al coneutar esti preséu USB?</string>
   <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
-  <string name="usb_accessory_confirm_prompt">¿Quies abrir <xliff:g id="ACTIVITY">%1$s</xliff:g> al coneutar esti preséu USB?</string>
   <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
-  <string name="usb_accessory_uri_prompt">Nenguna aplicación instalada funciona con esti preséu USB. Más información: <xliff:g id="URL">%1$s</xliff:g></string>
   <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
-  <string name="title_usb_accessory">Preséu USB</string>
+  <string name="title_usb_accessory">Accesoriu USB</string>
   <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
   <string name="label_view">Ver</string>
   <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
-  <string name="always_use_device">Usar de mou predetermináu pa esti preséu USB</string>
   <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
-  <string name="always_use_accessory">Usar de mou predetermináu pa esti preséu USB</string>
   <!-- Title of confirmation dialog for USB debugging -->
   <string name="usb_debugging_title">¿Permitir depuración USB?</string>
   <!-- Message of confirmation dialog for USB debugging -->
-  <string name="usb_debugging_message">La buelga dixital de la to clave RSA ye:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g></string>
   <!-- Option to always allow USB debugging from the attached computer -->
-  <string name="usb_debugging_always">Permitir siempre dende esti ordenador</string>
   <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
-  <string name="usb_debugging_secondary_user_title">Depuración USB non permitida</string>
   <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
-  <string name="usb_debugging_secondary_user_message">L\'usuariu coneutáu agora con esti preséu nun pue activar la depuración por USB. Pa usar esta función, has camudar al usuariu principal \u201C<xliff:g id="name" example="John Doe">%s</xliff:g>\u201D.</string>
   <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
          on a phone).  [CHAR LIMIT=25] -->
-  <string name="compat_mode_on">Zoom p\'axustar</string>
   <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
          [CHAR LIMIT=25] -->
-  <string name="compat_mode_off">Espander p\'axustar</string>
   <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
-  <string name="screenshot_saving_ticker">Guardando captura...</string>
   <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
-  <string name="screenshot_saving_title">Guardando captura...</string>
   <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
-  <string name="screenshot_saving_text">La captura de pantalla ta guardándose.</string>
   <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
-  <string name="screenshot_saved_title">Captura guardada</string>
   <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
-  <string name="screenshot_saved_text">Toca pa ver la captura de pantalla</string>
   <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
-  <string name="screenshot_failed_title">Nun pudo guardase la captura de pantalla.</string>
   <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
-  <string name="screenshot_failed_text">Nun pue facese captura de pantalla porque nun hai espaciu, o nun hai permisu pa esta app.</string>
   <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
-  <string name="usb_preference_title">Opciones de tresferencia de ficheros por USB</string>
   <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
-  <string name="use_mtp_button_title">Activar como reproductor de medios (MTP)</string>
   <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
-  <string name="use_ptp_button_title">Activar como cámara (PTP)</string>
   <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
-  <string name="installer_cd_button_title">Instalar Android File Transfer pa Mac</string>
   <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_back">Atrás</string>
   <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -155,7 +112,6 @@
   <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_menu">Menú</string>
   <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_recent">Perspeutiva</string>
   <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
   <string name="accessibility_search_light">Guetar</string>
   <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -163,101 +119,67 @@
   <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_button">Teléfonu</string>
   <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_voice_assist_button">Asistente voz</string>
+  <string name="accessibility_voice_assist_button">Asistente per voz</string>
   <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_unlock_button">Desbloquiar</string>
   <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_unlock_button_fingerprint">Botón de desbloquéu, esperando buelga dixital</string>
   <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_unlock_without_fingerprint">Desbloquiar ensin usar buelga dixital</string>
   <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
-  <string name="unlock_label">desbloquiar</string>
   <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
-  <string name="phone_label">abrir teléfonu</string>
   <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
-  <string name="voice_assist_label">abrir l\'encontu de voz</string>
   <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
-  <string name="camera_label">abrir cámara</string>
   <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
-  <string name="recents_caption_resize">Esbilla\'l diseñu nuevu de la xera</string>
   <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
   <string name="cancel">Encaboxar</string>
   <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_compatibility_zoom_button">Botón de zoom de compatibilidá</string>
   <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_compatibility_zoom_example">Zoom de pantalla más pequeña a más grande</string>
   <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_bluetooth_connected">Bluetooth coneutáu</string>
   <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_bluetooth_disconnected">Bluetooth desconeutáu</string>
   <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_no_battery">Ensin batería</string>
+  <string name="accessibility_no_battery">Ensin batería.</string>
   <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_battery_one_bar">Una barra de batería</string>
+  <string name="accessibility_battery_one_bar">Una barra de batería.</string>
   <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_battery_two_bars">Dos barres de batería</string>
+  <string name="accessibility_battery_two_bars">Dos barres de batería.</string>
   <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_battery_three_bars">Trés barres de batería</string>
+  <string name="accessibility_battery_three_bars">Trés barres de batería.</string>
   <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_battery_full">Batería completa</string>
   <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_no_phone">Ensin teléfonu</string>
   <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_phone_one_bar">Una barra de cobertoria</string>
   <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_phone_two_bars">Dos barres de cobertoria</string>
   <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_phone_three_bars">Trés barres de cobertoria</string>
   <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_phone_signal_full">Cobertoria al máximu</string>
   <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_no_data">Ensin datos</string>
   <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_data_one_bar">Una barra de datos</string>
   <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_data_two_bars">Dos barres de datos</string>
   <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_data_three_bars">Trés barres de datos</string>
   <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_data_signal_full">Señal de datos al máximu</string>
   <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_name">Coneutáu a <xliff:g id="wifi" example="Home Network">%s</xliff:g>.</string>
   <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
-  <string name="accessibility_bluetooth_name">Coneutáu a <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
   <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_no_wimax">Ensin conexón WiMAX</string>
   <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_one_bar">Una barra de WiMAX</string>
   <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_two_bars">Dos barres de WiMAX</string>
   <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wimax_three_bars">Trés barres de WiMAX</string>
+  <string name="accessibility_wimax_three_bars">Tres barres de WiMAX.</string>
   <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wimax_signal_full">Señal de WiMAX al máximu</string>
   <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_ethernet_disconnected">Ethernet desconeutada.</string>
   <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_ethernet_connected">Ethernet coneutada.</string>
   <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_no_signal">Nun hai señal</string>
+  <string name="accessibility_no_signal">Ensin señal.</string>
   <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
-  <string name="accessibility_not_connected">Ensin conexón</string>
   <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_zero_bars">Nenguna barra</string>
+  <string name="accessibility_zero_bars">Cero barres.</string>
   <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_one_bar">Una barra</string>
+  <string name="accessibility_one_bar">Una barra.</string>
   <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_two_bars">Dos barres</string>
+  <string name="accessibility_two_bars">Dos barres.</string>
   <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_three_bars">Trés barres</string>
+  <string name="accessibility_three_bars">Tres barres.</string>
   <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_signal_full">Señal al máximu</string>
   <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_desc_on">Activáu</string>
   <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_desc_off">Desactiváu</string>
   <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_desc_connected">Coneutáu</string>
   <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_connecting">Coneutando.</string>
   <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -283,186 +205,116 @@
   <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_wifi">Wi-Fi</string>
   <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_no_sim">Ensin tarxeta SIM</string>
+  <string name="accessibility_no_sim">Ensin SIM.</string>
   <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_bluetooth_tether">Anclaxe de Bluetooth</string>
   <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_airplane_mode">Mou avión</string>
+  <string name="accessibility_airplane_mode">Mou avión.</string>
   <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_sims">Ensin tarxeta SIM.</string>
   <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_carrier_network_change_mode">Cambéu de fornidor de rede.</string>
   <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_battery_level"><xliff:g id="NUMBER">%d</xliff:g> por cientu de batería</string>
   <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_settings_button">Axustes del sistema</string>
+  <string name="accessibility_settings_button">Axustes del sistema.</string>
   <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_notifications_button">Notificaciones</string>
+  <string name="accessibility_notifications_button">Avisos.</string>
   <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_remove_notification">Desaniciar notificación</string>
   <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_gps_enabled">GPS habilitáu</string>
   <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_gps_acquiring">Obteniendo llocalización...</string>
   <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_tty_enabled">Teletipu habilitáu</string>
   <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_ringer_vibrate">Mou vibración</string>
   <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_ringer_silent">Mou silenciu</string>
   <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_casting">@string/quick_settings_casting</string>
   <!-- Content description to tell the user that this button will remove an application from recents -->
-  <string name="accessibility_recents_item_will_be_dismissed">Descartar <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
   <!-- Content description to tell the user an application has been removed from recents -->
-  <string name="accessibility_recents_item_dismissed">Desanicióse <xliff:g id="APP">%s</xliff:g>.</string>
   <!-- Content description to tell the user all applications has been removed from recents -->
-  <string name="accessibility_recents_all_items_dismissed">Descartáronse toles aplicaciones recientes.</string>
   <!-- Content description to tell the user an application has been launched from recents -->
-  <string name="accessibility_recents_item_launched">Aniciando <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
   <!-- Content description of individual recents task. -->
-  <string name="accessibility_recents_task_header"><xliff:g id="app" example="Chrome">%1$s</xliff:g> <xliff:g id="activity_label" example="www.google.com">%2$s</xliff:g></string>
   <!-- Content description to tell the user a notification has been removed from the notification shade -->
-  <string name="accessibility_notification_dismissed">Notificación inorada</string>
   <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_desc_notification_shade">Pantalla de notificaciones</string>
   <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_quick_settings">Axustes rápidos</string>
   <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_desc_lock_screen">Pantalla de bloquéu.</string>
   <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_settings">Axustes</string>
   <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_desc_recent_apps">Perspeutiva.</string>
   <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_close">Zarrar</string>
   <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_user">Usuariu <xliff:g id="USER">%s</xliff:g></string>
+  <string name="accessibility_quick_settings_user">Usuariu <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>
   <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>.</string>
   <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_wifi_changed_off">Wifi apagada.</string>
   <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_wifi_changed_on">Wifi prendida.</string>
   <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_mobile">Móvil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g></string>
   <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery">Batería <xliff:g id="STATE">%s</xliff:g></string>
   <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_airplane_off">Mou avión apagáu.</string>
   <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_airplane_on">Mou avión prendíu.</string>
   <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_airplane_changed_off">Mou avión apagáu.</string>
   <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_airplane_changed_on">Mou avión prendíu.</string>
   <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_dnd_priority_on">Nun molestar activáu (namái prioridá)</string>
   <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_dnd_none_on">Nun molestar activáu, silenciu total.</string>
   <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_dnd_alarms_on">Nun molestar activáu, namái alarmes.</string>
   <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_dnd_off">Nun molestar desactiváu.</string>
   <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_dnd_changed_off">Nun molestar desactiváu.</string>
   <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_dnd_changed_on">Nun molestar activáu.</string>
   <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_bluetooth_off">Bluetooth desactiváu.</string>
   <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_bluetooth_on">Bluetooth prendíu.</string>
   <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_bluetooth_connecting">Coneutando Bluetooth.</string>
   <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_bluetooth_connected">Bluetooth coneutáu.</string>
   <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_bluetooth_changed_off">Bluetooth desconeutáu.</string>
   <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_bluetooth_changed_on">Bluetooth coneutáu.</string>
   <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_off">Informe de llocalización desactiváu</string>
   <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_on">Informe de llocalización activáu</string>
   <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_off">Informe de llocalización apagáu</string>
   <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_on">Informe de llocalización prendíu</string>
   <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_alarm">L\'alarma va sonar a les <xliff:g id="TIME">%s</xliff:g>.</string>
   <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_close">Zarrar panel.</string>
   <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_more_time">Más tiempu.</string>
   <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_less_time">Menos tiempu.</string>
   <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_flashlight_off">Llinterna apagada.</string>
   <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_flashlight_on">Llinterna prendida.</string>
   <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_flashlight_changed_off">Llinterna desconeutada.</string>
   <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_flashlight_changed_on">Llinterna coneutada.</string>
   <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_color_inversion_changed_off">Inversión de color apagáu</string>
   <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_color_inversion_changed_on">Inversión de color prendíu</string>
   <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_hotspot_changed_off">Puntu d\'accesu móvil apagáu</string>
   <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_hotspot_changed_on">Puntu d\'accesu móvil prendíu</string>
   <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_casting_turned_off">Pantalla d\'emisión parada.</string>
   <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_brightness">Amosar brillu</string>
+  <string name="accessibility_brightness">Brilléu de pantalla</string>
   <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
-  <string name="data_usage_disabled_dialog_3g_title">Posáronse los datos 2G-3G</string>
   <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
-  <string name="data_usage_disabled_dialog_4g_title">Posáronse los datos 4G</string>
   <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
-  <string name="data_usage_disabled_dialog_mobile_title">Datos móviles en posa</string>
   <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
-  <string name="data_usage_disabled_dialog_title">Datos posaos</string>
   <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
-  <string name="data_usage_disabled_dialog">Darréu qu\'algamóse la llende de datos afitada, el preséu paró l\'usu de datos pal restu d\'esti ciclu.\n\nReanudar esto, podría tener como resultáu cargos del fornidor.</string>
   <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
-  <string name="data_usage_disabled_dialog_enable">Reanudar</string>
   <!-- Text to display underneath the graphical signal strength meter when
          no connection is available. [CHAR LIMIT=20] -->
-  <string name="status_bar_settings_signal_meter_disconnected">Ensin conexón a Internet</string>
   <!-- Text to display underneath the graphical signal strength meter when
          it is displaying Wi-Fi status and Wi-Fi is connected to a network
          whose SSID is not available.
          [CHAR LIMIT=20] -->
-  <string name="status_bar_settings_signal_meter_wifi_nossid">Con conexón Wi-Fi</string>
   <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
-  <string name="gps_notification_searching_text">Guetando GPS</string>
   <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
-  <string name="gps_notification_found_text">Llocalización definida por GPS</string>
   <!-- Accessibility text describing the presence of active location requests by one or more apps -->
-  <string name="accessibility_location_active">Solicitúes de llocalización actives</string>
   <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_clear_all">Llimpiar toles notificaciones</string>
+  <string name="accessibility_clear_all">Llimpiar tolos avisos.</string>
   <!-- Content description of button in notification inspector for system settings relating to
          notifications from this application [CHAR LIMIT=NONE] -->
-  <string name="status_bar_notification_inspect_item_title">Axustes de notificaciones</string>
+  <string name="status_bar_notification_inspect_item_title">Axustes d\'avisos</string>
   <!-- Content description of button in notification inspetor for application-provided settings
          for its own notifications [CHAR LIMIT=NONE] -->
-  <string name="status_bar_notification_app_settings_title">Axustes <xliff:g id="app_name" example="Calendar">%s</xliff:g></string>
+  <string name="status_bar_notification_app_settings_title">Axustes de <xliff:g id="app_name" example="Calendar">%s</xliff:g></string>
   <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
-  <string name="accessibility_rotation_lock_off">La pantalla va xirar automáticamente.</string>
   <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
-  <string name="accessibility_rotation_lock_on_landscape">La pantalla ta bloquiada en mou horizontal.</string>
   <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
-  <string name="accessibility_rotation_lock_on_portrait">La pantalla ta bloquiada en mou vertical.</string>
   <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_rotation_lock_off_changed">La pantalla va xirar agora automáticamente.</string>
   <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_rotation_lock_on_landscape_changed">La pantalla ta bloquiada en mou horizontal.</string>
   <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
-  <string name="accessibility_rotation_lock_on_portrait_changed">La pantalla ta bloquiada en mou vertical.</string>
   <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
-  <string name="dessert_case">Caxa para postres</string>
   <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
   <string name="start_dreams">Curiapantalles</string>
   <!-- Textual description of Ethernet connections -->
@@ -480,27 +332,20 @@
   <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_multiple_devices_label">Bluetooth (<xliff:g id="NUMBER">%d</xliff:g> preseos)</string>
   <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_bluetooth_off_label">Bluetooth desactiváu</string>
   <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_bluetooth_detail_empty_text">Nun hai disponibles preseos empareyaos</string>
   <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_brightness_label">Brillu</string>
+  <string name="quick_settings_brightness_label">Brilléu</string>
   <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_rotation_unlocked_label">Xiru-auto</string>
+  <string name="quick_settings_rotation_unlocked_label">Auto-voltéu</string>
   <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_rotation_locked_label">Xiru bloquiáu</string>
   <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_rotation_locked_portrait_label">Retratu</string>
   <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_rotation_locked_landscape_label">Paisaxe</string>
   <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
   <string name="quick_settings_ime_label">Métodu d\'entrada</string>
   <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_location_label">Llocalización</string>
+  <string name="quick_settings_location_label">Allugamientu</string>
   <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_location_off_label">Llocalización desactivada</string>
   <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_media_device_label">Preséu multimedia</string>
   <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_label">RSSI</string>
   <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
@@ -508,7 +353,6 @@
   <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
   <string name="quick_settings_settings_label">Axustes</string>
   <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_time_label">Hora</string>
   <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_label">Yo</string>
   <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
@@ -518,29 +362,22 @@
   <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_label">Wi-Fi</string>
   <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_wifi_not_connected">Non coneutáu</string>
   <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_no_network">Nun hai rede.</string>
   <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_wifi_off_label">Wi-Fi desactiváu</string>
   <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_detail_empty_text">Nun hai redes Wi-Fi disponibles</string>
   <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_cast_title">Tresmitir</string>
   <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_casting">Emisión</string>
   <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_cast_device_default_name">Preséu ensin nome</string>
   <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_cast_device_default_description">Preparáu pa emitir</string>
   <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cast_detail_empty_text">Nun hai preseos disponibles</string>
   <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_brightness_dialog_title">Brillu</string>
+  <string name="quick_settings_brightness_dialog_title">Brilléu</string>
   <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_auto_brightness_label">AUTO</string>
   <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_inversion_label">Invertir colores</string>
   <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_color_space_label">Mou de correición de color</string>
   <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
@@ -548,117 +385,84 @@
   <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_done">Fecho</string>
   <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_connected">Coneutáu</string>
   <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_connecting">Coneutando...</string>
   <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_tethering_label">Anclaxe a rede</string>
+  <string name="quick_settings_tethering_label">Tethering</string>
   <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_hotspot_label">Hotspot</string>
   <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_notifications_label">Notificaciones</string>
+  <string name="quick_settings_notifications_label">Avisos</string>
   <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
   <string name="quick_settings_flashlight_label">Llinterna</string>
   <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_cellular_detail_title">Datos móvil</string>
+  <string name="quick_settings_cellular_detail_title">Datos móviles</string>
   <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_usage">Usu de datos</string>
   <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_remaining_data">Datos restantes</string>
   <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
   <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_cellular_detail_data_used"><xliff:g id="data_used" example="2.0 GB">%s</xliff:g> usaos</string>
   <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_cellular_detail_data_limit">Llende <xliff:g id="data_limit" example="2.0 GB">%s</xliff:g></string>
   <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_cellular_detail_data_warning">Avisu <xliff:g id="data_limit" example="2.0 GB">%s</xliff:g></string>
   <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
   <string name="recents_empty_message">Les tos pantalles recientes apaecen equí</string>
   <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
-  <string name="recents_app_info_button_label">Info d\'aplicación</string>
   <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
   <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
-  <string name="recents_search_bar_label">guetar</string>
   <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
   <string name="recents_launch_error_message">Nun pudo aniciase <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
   <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
-  <string name="recents_dismiss_all_message">Descartar toles apps</string>
   <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
-  <string name="recents_multistack_add_stack_dialog_split_horizontal">División horizontal</string>
+  <string name="recents_multistack_add_stack_dialog_split_horizontal">Dixebra horizontal</string>
   <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
-  <string name="recents_multistack_add_stack_dialog_split_vertical">División vertical</string>
+  <string name="recents_multistack_add_stack_dialog_split_vertical">Dixebra vertical</string>
   <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
-  <string name="recents_multistack_add_stack_dialog_split_custom">División personalizada</string>
+  <string name="recents_multistack_add_stack_dialog_split_custom">Dixebra personalizada</string>
   <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
-  <string name="expanded_header_battery_charged">Cargada</string>
   <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_charging">Cargando</string>
   <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
-  <string name="expanded_header_battery_charging_with_time">Queden <xliff:g id="charging_time" example="2 hrs 25 min">%s</xliff:g> cargando</string>
   <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
-  <string name="expanded_header_battery_not_charging">Nun se ta cargando</string>
   <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
   <string name="battery_meter_very_low_overlay_symbol">!</string>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.
          If the text fits on one line (~14 chars), it should start with a
          linebreak to position it correctly.  [CHAR LIMIT=45] -->
-  <string name="ssl_ca_cert_warning">La rede pue\nsupervisase</string>
   <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="description_target_search">Guetar</string>
   <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
-  <string name="description_direction_up">Esliza\'l deu hacia arriba pa <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
   <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
-  <string name="description_direction_left">\"Esliza\'l deu hacia la esquierda pa <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
   <!-- Zen mode: Priority only introduction message on first use -->
-  <string name="zen_priority_introduction">Nun van molestate los soníos nin les vibraciones, sacante que seyan alarmes, recordatorios, eventos y emisores qu\'especifiques.</string>
   <!-- Zen mode: Priority only customization button label -->
   <string name="zen_priority_customize_button">Personalizar</string>
   <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
-  <string name="zen_silence_introduction_voice">Esta aición bloquia TOLOS soníos y les vibraciones, incluyíes les que remanecen d\'alarmes, vídeos y xuegos. Vas poder facer llamaes telefóniques.</string>
+  <string name="zen_silence_introduction_voice">Esto bloquia TOLOS soníos, vibraciones, incluyendo les de les alarmes, música, vídeos y xuegos. Entá sedrás a facer llamaes telefóniques.</string>
   <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
-  <string name="zen_silence_introduction">Esta aición bloquia TOLOS soníos y les vibraciones, incluyíes les que remanecen d\'alarmes, vídeos y xuegos.</string>
+  <string name="zen_silence_introduction">Esto bloquia TOLOS soníos, vibraciones, incluyendo les de les alarmes, música, vídeos y xuegos.</string>
   <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
   <string name="keyguard_more_overflow_text">+<xliff:g id="number_of_notifications" example="5">%d</xliff:g></string>
   <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
-  <string name="speed_bump_explanation">Notificaciones menos urxentes, debaxo</string>
   <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
-  <string name="notification_tap_again">Toca otra vuelta p\'abrir</string>
+  <string name="notification_tap_again">Volvi tocar p\'abrir</string>
   <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
-  <string name="keyguard_unlock">Eslizar arriba pa desbloquiar</string>
   <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
-  <string name="phone_hint">Esliza\'l deu pa desbloquiar el teléfonu</string>
   <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
-  <string name="voice_hint">Esliza\'l deu dende l\'iconu p\'abrir encontu de voz</string>
   <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
-  <string name="camera_hint">Esliza\'l deu p\'acceder a la cámara</string>
   <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
-  <string name="interruption_level_none_with_warning">Silenciu total. Tamién van silenciase los llectores de pantalla.</string>
   <!-- Interruption level: None. [CHAR LIMIT=40] -->
-  <string name="interruption_level_none">Silenciu total</string>
   <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
-  <string name="interruption_level_priority">Namái prioridá</string>
   <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
-  <string name="interruption_level_alarms">Namái alarmes</string>
   <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
-  <string name="interruption_level_none_twoline">Silenciu\ntotal</string>
   <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
-  <string name="interruption_level_priority_twoline">Namái\nprioridá</string>
   <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
-  <string name="interruption_level_alarms_twoline">Namái\nalarmes</string>
   <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
-  <string name="keyguard_indication_charging_time">Cargando (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar)</string>
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
-  <string name="keyguard_indication_charging_time_fast">Carga rápida (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar la carga)</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">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 -->
   <!-- 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. -->
-  <string name="accessibility_multi_user_switch_switcher_with_current">Cambiar usuariu, usuariu actual <xliff:g id="current_user_name" example="John Doe">%s</xliff:g></string>
   <!-- Accessibility label for the user icon on the lock screen. -->
-  <string name="accessibility_multi_user_switch_inactive">L\'usuariu actual ye <xliff:g id="current_user_name" example="John Doe">%s</xliff:g></string>
   <!-- Accessibility label for the button that opens the quick contact of the user. -->
   <string name="accessibility_multi_user_switch_quick_contact">Amosar perfil</string>
   <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
@@ -672,39 +476,32 @@
   <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
   <string name="guest_exit_guest">Desaniciar convidáu</string>
   <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
-  <string name="guest_exit_guest_dialog_title">Desaniciar convidáu?</string>
+  <string name="guest_exit_guest_dialog_title">¿Desaniciar convidáu?</string>
   <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
-  <string name="guest_exit_guest_dialog_message">Van desaniciase toles apps y datos nesta sesión.</string>
+  <string name="guest_exit_guest_dialog_message">Desaniciaránse toles aplicaciones y datos nesta sesión.</string>
   <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
   <string name="guest_exit_guest_dialog_remove">Desaniciar</string>
   <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
-  <string name="guest_wipe_session_title">Bienllegáu otra vuelta, convidáu!</string>
   <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
-  <string name="guest_wipe_session_message">Quies continuar la to sesión?</string>
+  <string name="guest_wipe_session_message">¿Quies siguir cola to sesión?</string>
   <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
-  <string name="guest_wipe_session_wipe">Aniciar sesión nueva</string>
   <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
   <string name="guest_wipe_session_dontwipe">Sí, siguir</string>
   <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
   <string name="guest_notification_title">Usuariu convidáu</string>
   <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
-  <string name="guest_notification_text">Pa desaniciar aplicaciones y datos, desanicia l\'usuariu convidáu</string>
   <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
   <string name="guest_notification_remove_action">DESANICIAR CONVIDÁU</string>
   <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
-  <string name="user_add_user_title" msgid="2108112641783146007">Amestar usuariu nuevu?</string>
+  <string name="user_add_user_title" msgid="2108112641783146007">¿Amestar usuariu nuevu?</string>
   <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
-  <string name="user_add_user_message_short" msgid="1511354412249044381">Cuando amiestes un usuariu nuevu, esi usuariu necesita configurar el so espaciu\n\nCualquier usuariu pue anovar apps pa otros usuarios. </string>
   <!-- Battery saver notification title. [CHAR LIMIT=60]-->
-  <string name="battery_saver_notification_title">L\'aforrador de batería ta activáu</string>
   <!-- Battery saver notification text. [CHAR LIMIT=60] -->
-  <string name="battery_saver_notification_text">Amenorga los datos de rindimientu y de fondu</string>
+  <string name="battery_saver_notification_text">Amenorga\'l rindimientu y datos de fondu</string>
   <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
-  <string name="battery_saver_notification_action_text">Prender l\'aforrador d\'enerxía</string>
+  <string name="battery_saver_notification_action_text">Desactivar aforrador de batería</string>
   <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
-  <string name="notification_hidden_text">Conteníos anubríos</string>
   <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
-  <string name="media_projection_dialog_text"><xliff:g id="app_seeking_permission" example="Hangouts">%s</xliff:g> va empezar a capturar tolo que s\'amuese na pantalla.</string>
   <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
   <string name="media_projection_remember_text">Nun amosar más</string>
   <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
@@ -712,75 +509,59 @@
   <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
   <string name="media_projection_action_text">Aniciar agora</string>
   <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
-  <string name="empty_shade_text">Nun tienes notificaciones</string>
+  <string name="empty_shade_text">Nun hai avisos</string>
   <!-- Footer device owned text [CHAR LIMIT=50] -->
-  <string name="device_owned_footer">El preséu pue ser monitoreáu</string>
   <!-- Footer profile owned text [CHAR LIMIT=50] -->
-  <string name="profile_owned_footer">El perfil pue ser monitoreáu</string>
   <!-- Footer vpn present text [CHAR LIMIT=50] -->
-  <string name="vpn_footer">La rede pue ser monitoreada</string>
   <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
-  <string name="monitoring_title_device_owned">Monitoréu de preseos</string>
+  <string name="monitoring_title_device_owned">Monitorización de preseos</string>
   <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
-  <string name="monitoring_title_profile_owned">Monitoréu de perfiles</string>
+  <string name="monitoring_title_profile_owned">Monitorización de perfiles</string>
   <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
-  <string name="monitoring_title">Monitoréu de rede</string>
+  <string name="monitoring_title">Monitorización de rede</string>
   <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
-  <string name="disable_vpn">Deshabilitar VPN</string>
   <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
-  <string name="disconnect_vpn">Desconeutar VPN</string>
   <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
-  <string name="monitoring_description_device_owned"><xliff:g id="ORGANIZATION">%1$s</xliff:g> xestiona\'l to preséu.\n\nL\'alministrador pue supervisar y alministra la configuración, l\'accesu corporativu, les aplicaciones, los datos asociaos a esti preséu y la información de llocalización del preséu. Pa obtener más información, comunícate col alministrador.</string>
   <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
-  <string name="monitoring_description_vpn">Disti permisu a una app p\'afitar una conexón VPN.\n\nEsta app pue monitorear el preséu y l\'actividá de rede, incluyendo correos, apps y webs.</string>
   <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
-  <string name="monitoring_description_vpn_device_owned"><xliff:g id="ORGANIZATION">%1$s</xliff:g> xestiona\'l to preséu.\n\nL\'alministrador pue supervisar y alministra la configuración, l\'accesu corporativu, les aplicaciones, los datos asociaos a esti preséu y la información de llocalización del preséu. Pa obtener más información, comunícate col alministrador.\n\nTamién tienes una conexón VPN, que pue supervisar l\'actividá de la rede (corréu-e, apps y sitios web).\n\nPa tener más información, contauta col alministrador.</string>
   <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
-  <string name="monitoring_description_vpn_profile_owned"><xliff:g id="organization">%1$s</xliff:g> xestiona\'l to perfil de trabayu.\n\nL\'alministrador pue supervisar l\'actividá de la rede, incluyíos los correos-e, les apps y los sitios web.\n\nPa obtener más información, comunícate col alministrador.\n\nTamién tienes conexón a una VPN, que pue supervisar l\'actividá de la to rede.</string>
   <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
   <string name="legacy_vpn_name">VPN</string>
   <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
-  <string name="monitoring_description_app">Tas coneutáu a <xliff:g id="application">%1$s</xliff:g>, que pue monitorear la to actividá personal na rede, correos, apps y sitios web.</string>
   <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
-  <string name="monitoring_description_app_personal">Tas coneutáu a <xliff:g id="application">%1$s</xliff:g>, que pue monitorear la to actividá personal na rede, correos, apps y sitios web.</string>
   <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
-  <string name="monitoring_description_app_work"><xliff:g id="organization">%1$s</xliff:g> xestiona\'l to perfil de trabayu. Ta coneutáu a <xliff:g id="application">%2$s</xliff:g>, que pue supervisar l\'actividá de la rede, incluyíos los correos-e, les apps y los sitios web.\n\nPa obtener más información, contauta col alministrador.</string>
   <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
-  <string name="monitoring_description_app_personal_work"><xliff:g id="organization">%1$s</xliff:g> xestiona\'l to perfil de trabayu. Ta coneutáu a <xliff:g id="application_work">%2$s</xliff:g>, que pue supervisar l\'actividá de la rede, incluyíos los correos-e, les apps y los sitios web.\n\nTamién tas coneutáu a <xliff:g id="application_personal">%3$s</xliff:g>, que pue monitorear la to actividá personal na rede.</string>
   <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
-  <string name="monitoring_description_vpn_app_device_owned"><xliff:g id="ORGANIZATION">%1$s</xliff:g> xestiona\'l to preséu.\n\nL\'alministrador pue supervisar y alministra la configuración, l\'accesu corporativu, les aplicaciones, los datos asociaos a esti preséu y la información de llocalización del preséu.\n\nTienes conexón a <xliff:g id="APPLICATION">%2$s</xliff:g>, que pue supervisar l\'actividá de la rede, incluidos los correos electrónicos, les aplicaciones y los sitios web.\n\nPa obtener más información, comunícate col alministrador.</string>
   <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
-  <string name="keyguard_indication_trust_disabled">El preséu va tar bloquiáu hasta que lu desbloquies manualmente</string>
   <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
-  <string name="hidden_notifications_title">Obtener notificaciones más rápido</string>
   <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
-  <string name="hidden_notifications_text">Veles enantes de desbloquiar</string>
   <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
   <string name="hidden_notifications_cancel">Non, gracies</string>
   <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
   <string name="hidden_notifications_setup">Configurar</string>
   <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
-  <string name="notification_expand_button_text">Ver toes</string>
+  <string name="notification_expand_button_text">Ver toos</string>
   <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
-  <string name="notification_collapse_button_text">Anubrir toes</string>
+  <string name="notification_collapse_button_text">Anubrir toos</string>
   <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
   <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string>
   <!-- Button label for ending zen mode in the volume dialog -->
-  <string name="volume_zen_end_now">Finar agora</string>
   <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
-  <string name="accessibility_volume_expand">Espander</string>
   <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
-  <string name="accessibility_volume_collapse">Contrayer</string>
   <!-- Screen pinning dialog title. -->
   <!-- Screen pinning dialog description. -->
   <!-- Screen pinning dialog description when in accessibility mode. -->
   <!-- Screen pinning positive response. -->
+  <string name="screen_pinning_positive">Coyío</string>
   <!-- Screen pinning negative response. -->
+  <string name="screen_pinning_negative">Non, gracies</string>
   <!-- Hide quick settings tile confirmation title -->
+  <string name="quick_settings_reset_confirmation_title">¿Anubrir <xliff:g id="tile_label" example="Hotspot">%1$s</xliff:g>?</string>
   <!-- Hide quick settings tile confirmation message -->
+  <string name="quick_settings_reset_confirmation_message">Apaecerá la próxima vegada que lu actives n\'Axustes.</string>
   <!-- Hide quick settings tile confirmation button -->
+  <string name="quick_settings_reset_confirmation_button">Anubrir</string>
   <!-- VolumeUI activation dialog: warning message -->
-  <string name="volumeui_prompt_message"><xliff:g id="app_name" example="Volume Prototype 1">%1$s</xliff:g> quier ser el cuadru de diálogu de volume.</string>
   <!-- VolumeUI activation dialog: allow button label -->
   <string name="volumeui_prompt_allow">Permitir</string>
   <!-- VolumeUI activation dialog: deny button label -->
@@ -792,21 +573,17 @@
   <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
   <string name="managed_profile_foreground_toast">Tas usando\'l to perfil de trabayu</string>
   <!-- Name of special SystemUI debug settings -->
-  <string name="system_ui_tuner">Sintonizador de IU del sistema</string>
   <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
-  <string name="show_battery_percentage">Amosar porcentaxe de la batería integrada</string>
   <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
-  <string name="show_battery_percentage_summary">Amosar porcentaxe del nivel de batería nel iconu de la barra d\'estáu cuando nun se ta cargando</string>
+  <string name="show_battery_percentage_summary">Amuesa\'l porcentaxe de batería dientro l\'iconu de la barra d\'estáu cuando nun se ta cargando</string>
   <!-- Name of quick settings -->
   <string name="quick_settings">Axustes rápidos</string>
   <!-- Name of status bar -->
   <string name="status_bar">Barra d\'estáu</string>
   <!-- Name of demo mode (mode with preset icons for screenshots) -->
-  <string name="demo_mode">Mou desmostración</string>
+  <string name="demo_mode">Mou demostración</string>
   <!-- Enable demo mode -->
-  <string name="enable_demo_mode">Activar el mou de demostración</string>
   <!-- Show demo mode icons -->
-  <string name="show_demo_mode">Amosar mou demo</string>
   <!-- Name of the ethernet status bar icon. -->
   <string name="status_bar_ethernet">Ethernet</string>
   <!-- Name of the alarm status bar icon. -->
@@ -816,45 +593,31 @@
   <!-- Name of the airplane status bar icon. -->
   <string name="status_bar_airplane">Mou avión</string>
   <!-- Description for adding  a quick settings tile -->
-  <string name="add_tile">Amestar mosaicu</string>
+  <string name="add_tile">Amestar caxella</string>
   <!-- Name of a quick settings tile controlled by broadcast -->
-  <string name="broadcast_tile">Mosaicu de tresmisión</string>
+  <string name="broadcast_tile">Caxella de tresmisión</string>
   <!-- For preview release. DO NOT TRANSLATE -->
-  <string name="regrettable_lack_of_easter_egg">
-        ¯\\_(ツ)_/¯
-    </string>
   <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
-  <string name="zen_alarm_warning_indef">Nun vas sentir la próxima alarma a la(les) <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g> sacantes que desactives esta enantes</string>
   <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
-  <string name="zen_alarm_warning">Nun vas sentir la próxima alarma a la(les) <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g></string>
   <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
-  <string name="alarm_template">a la(les) <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g></string>
   <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
-  <string name="alarm_template_far">el <xliff:g id="WHEN">%1$s</xliff:g></string>
   <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_detail">Configuración rápida: <xliff:g id="TITLE">%s</xliff:g></string>
+  <string name="accessibility_quick_settings_detail">Axustes rápidos, <xliff:g id="title" example="Wi-Fi">%s</xliff:g>.</string>
   <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
-  <string name="accessibility_status_bar_hotspot">Hotspot</string>
   <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
   <string name="accessibility_managed_profile">Perfil de trabayu</string>
   <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
   <string name="tuner_warning_title">Diversión pa dalgunos, pero non pa toos</string>
   <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
-  <string name="tuner_warning">El sintonizador de IU del sistema date más formes pa editar y personalizar la interfaz d\'usuariu d\'Android. Estes funciones esperimentales puen camudar, dexar de furrular, o nun incluyise en versiones futures. Procede con precuru.</string>
   <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
-  <string name="tuner_persistent_warning">Estes funciones esperimentales puen camudar, dexar de furrular, o nun incluyise en versiones futures. Procede con precuru.</string>
   <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <string name="got_it">Coyío</string>
   <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
-  <string name="tuner_toast">Amestóse\'l sintonizador de IU del sistema a Axustes</string>
   <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
-  <string name="remove_from_settings">Quitar de Axustes</string>
+  <string name="remove_from_settings">Desaniciar d\'Axustes</string>
   <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
-  <string name="remove_from_settings_prompt">¿Quies quitar el sintonizador de IU del sistema de Axustes y dexar d\'usar toles sos funciones?</string>
   <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
-  <string name="enable_bluetooth_title">¿Prender Bluetooth?</string>
   <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
          conncted to the device [CHAR LIMIT=NONE] -->
-  <string name="enable_bluetooth_message">Pa coneutar el tecláu cola tablet, primero tienes d\'activar Bluetooth.</string>
   <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
-  <string name="enable_bluetooth_confirmation_ok">Activar</string>
 </resources>
diff --git a/packages/SystemUI/res/values-bg/cm_strings.xml b/packages/SystemUI/res/values-bg/cm_strings.xml
index d86244b..aba3040 100644
--- a/packages/SystemUI/res/values-bg/cm_strings.xml
+++ b/packages/SystemUI/res/values-bg/cm_strings.xml
@@ -36,8 +36,8 @@
   <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_recent_button">Последен бутон</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>
   <string name="navbar_empty_button">Празен бутон</string>
diff --git a/packages/SystemUI/res/values-ca/cm_strings.xml b/packages/SystemUI/res/values-ca/cm_strings.xml
index 8296219..fddfe08 100644
--- a/packages/SystemUI/res/values-ca/cm_strings.xml
+++ b/packages/SystemUI/res/values-ca/cm_strings.xml
@@ -65,12 +65,12 @@
   <string name="accessibility_quick_settings_profiles_changed">Perfil canviat a <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">S\'està inicialitzant\u2026</string>
   <!-- Lights settings, LED notification -->
-  <string name="led_notification_title">Ajustaments de llum</string>
+  <string name="led_notification_title">Configuració de llums</string>
   <string name="led_notification_text">Llum LED habilitada per ajustos</string>
   <string name="qs_tile_edit_header_instruction">Prem i aguanta les cel·les per reordenar-les</string>
   <string name="quick_settings_edit_label">Edita cel·les</string>
   <string name="quick_settings_cannot_delete_edit_tile">No s\'ha pogut esborrar la cel·la Edita</string>
-  <string name="qs_tiles_reset_confirmation">Vols restablir les cel·les d\'ajustaments ràpids a la configuració predeterminada?</string>
+  <string name="qs_tiles_reset_confirmation">Vols restablir les cel·les de configuració ràpida als paràmetres predeterminats?</string>
   <string name="quick_settings_tile_reset_to_default">Restableix la disposició per defecte</string>
   <string name="quick_settings_title_header">Capçalera</string>
   <string name="quick_settings_title_tiles">Cel·les</string>
diff --git a/packages/SystemUI/res/values-en-rAU/cm_strings.xml b/packages/SystemUI/res/values-en-rAU/cm_strings.xml
index 5607867..33d0aaf 100644
--- a/packages/SystemUI/res/values-en-rAU/cm_strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/cm_strings.xml
@@ -17,7 +17,9 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
   <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
   <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <!-- Text to use when the number in a notification info is too large
@@ -27,6 +29,8 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Swipe right for %1$s</string>
   <string name="right_shortcut_hint">Swipe left for %1$s</string>
+  <string name="lockscreen_message">Tap an icon on the left or right to reassign a lock screen shortcut.</string>
+  <string name="lockscreen_default_target">Default</string>
   <string name="select_application">Select application</string>
   <string name="lockscreen_choose_action_title">Choose action</string>
   <string name="lockscreen_none_target">None</string>
@@ -50,57 +54,128 @@
   <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Uninstall</string>
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Light brightness</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">Profiles off.</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">Profile: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <!-- 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">Profiles turned off.</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">Profile changed to <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Initialising\u2026</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Light settings</string>
+  <string name="led_notification_text">LED light enabled by settings</string>
+  <string name="qs_tile_edit_header_instruction">Press and hold tiles to rearrange</string>
+  <string name="quick_settings_edit_label">Edit tiles</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Cannot delete the Edit tile</string>
+  <string name="qs_tiles_reset_confirmation">Reset quick settings tiles to default configuration?</string>
+  <string name="quick_settings_tile_reset_to_default">Reset to default layout</string>
+  <string name="quick_settings_title_header">Header</string>
+  <string name="quick_settings_title_tiles">Tiles</string>
+  <string name="quick_settings_title_show_weather">Show weather</string>
+  <string name="quick_settings_title_show_brightness_slider">Show brightness slider</string>
+  <string name="quick_settings_title_enlarge_first_row">Enlarge first row</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch and hold the Back button to unpin.</string>
+  <string name="quick_settings_custom_tile_detail_title">Custom tile</string>
+  <string name="quick_settings_remove">Remove tile</string>
   <string name="quick_settings_network_adb_label">ADB over network</string>
   <string name="quick_settings_compass_label">Compass</string>
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">System profiles</string>
   <string name="quick_settings_profiles_off">Profiles disabled</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">Battery saver</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Battery saver (charging)</string>
+  <string name="quick_settings_caffeine_label">Caffeine</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">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">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">Sync turned 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">Sync turned on.</string>
+  <string name="quick_settings_sync_label">Sync</string>
+  <string name="quick_settings_volume_panel_label">Volume panel</string>
+  <string name="quick_settings_usb_tether_label">USB tethering</string>
   <string name="quick_settings_screen_timeout_detail_title">Screen timeout</string>
   <string name="quick_settings_lockscreen_label">Lock screen</string>
+  <string name="quick_settings_ambient_display_label">Ambient display</string>
   <string name="quick_settings_lockscreen_label_enforced">Lock screen enforced</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Disabled 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">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">Screen timeout changed to <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <string name="qs_tile_performance">Battery mode</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">Battery mode: power save mode.</string>
   <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">Battery mode: balanced mode.</string>
   <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">Battery mode: performance mode.</string>
   <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Battery mode: efficiency mode.</string>
   <!-- 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">Battery mode: quick mode.</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">Battery mode changed to power save mode.</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">Battery mode changed to balanced mode.</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">Battery mode changed to performance mode.</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">Battery mode changed to efficiency mode.</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">Battery mode changed to quick mode.</string>
+  <string name="quick_settings_performance_profile_detail_title">Battery mode</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">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">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">Lock screen turned 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">Lock screen turned 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">Ambient display off.</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">Ambient display on.</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">Ambient display turned off.</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">Ambient display turned on.</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 off.</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 on.</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 turned off.</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 turned on.</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">Caffeine off.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Caffeine on.</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">Battery saver off.</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">Battery saver on.</string>
   <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Battery saver turned off.</string>
   <!-- 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">Battery saver turned on.</string>
   <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">Dynamic tile</string>
+  <string name="dynamic_qs_tile_next_alarm_label">Next alarm</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME selector</string>
+  <string name="dynamic_qs_tile_su_label">Root access</string>
+  <string name="dynamic_qs_tile_themes_label">Themes</string>
+  <string name="quick_settings_title_advanced_location">Tri-state 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">Location reporting: Battery-saving mode.</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -116,17 +191,36 @@
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">High accuracy</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">Location reporting changed to battery saving mode.</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">Location reporting changed to sensors only mode.</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">Location reporting changed to high accuracy mode.</string>
+  <string name="quick_settings_tiles_category_system">System tiles</string>
   <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Add a tile</string>
   <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Unable to connect to mobile networks while Aeroplane mode is enabled. Disable Aeroplane mode and try again.</string>
   <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Torch is on</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Tap to turn off</string>
   <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d clients</item>
+  </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">No data 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">Dock battery <xliff:g id="number">%d</xliff:g> percent.</string>
   <!-- Play queue -->
+  <string name="play_queue_extention">Show play queue</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">Swipe down to expand</string>
+  <string name="swipe_left_hint">Swipe left to <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Swipe right to notifications</string>
 </resources>
diff --git a/packages/SystemUI/res/values-en-rGB/cm_strings.xml b/packages/SystemUI/res/values-en-rGB/cm_strings.xml
index d7e892c..dc527ab 100644
--- a/packages/SystemUI/res/values-en-rGB/cm_strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/cm_strings.xml
@@ -200,7 +200,7 @@
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Add a tile</string>
   <!-- Hotspot dialog message -->
-  <string name="hotspot_apm_message">Unable to connect to mobile networks while Airplane mode is enabled. Disable Airplane mode and try again.</string>
+  <string name="hotspot_apm_message">Unable to connect to mobile networks while Aeroplane mode is enabled. Disable Aeroplane mode and try again.</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Torch is on</string>
   <string name="quick_settings_tile_flashlight_not_summary">Tap to turn off</string>
diff --git a/packages/SystemUI/res/values-en-rIN/cm_strings.xml b/packages/SystemUI/res/values-en-rIN/cm_strings.xml
index 37769e0..bdbf181 100644
--- a/packages/SystemUI/res/values-en-rIN/cm_strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/cm_strings.xml
@@ -75,6 +75,7 @@
   <string name="quick_settings_title_header">Header</string>
   <string name="quick_settings_title_tiles">Tiles</string>
   <string name="quick_settings_title_show_weather">Show weather</string>
+  <string name="quick_settings_title_show_brightness_slider">Show brightness slider</string>
   <string name="quick_settings_title_enlarge_first_row">Enlarge first row</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch and hold the Back button to unpin.</string>
@@ -88,6 +89,8 @@
   <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="quick_settings_battery_saver_label">Battery saver</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Battery saver (charging)</string>
+  <string name="quick_settings_caffeine_label">Caffeine</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">Sync off.</string>
   <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -103,6 +106,7 @@
   <string name="quick_settings_lockscreen_label">Lock screen</string>
   <string name="quick_settings_ambient_display_label">Ambient display</string>
   <string name="quick_settings_lockscreen_label_enforced">Lock screen enforced</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Disabled 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">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] -->
@@ -154,7 +158,9 @@
   <!-- 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 turned on.</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">Caffeine off.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Caffeine on.</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Battery saver off.</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -168,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Next alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME selector</string>
   <string name="dynamic_qs_tile_su_label">Root access</string>
+  <string name="dynamic_qs_tile_themes_label">Themes</string>
   <string name="quick_settings_title_advanced_location">Tri-state 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">Location reporting: battery saving mode.</string>
@@ -193,9 +200,17 @@
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Add a tile</string>
   <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Unable to connect to cellular networks while Aeroplane mode is enabled. Disable Aeroplane mode and try again.</string>
   <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Torch is on</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Tap to turn off</string>
   <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d clients</item>
+  </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">No data 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">Dock battery <xliff:g id="number">%d</xliff:g> percent.</string>
   <!-- Play queue -->
@@ -204,4 +219,8 @@
   <!-- 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">Swipe down to expand</string>
+  <string name="swipe_left_hint">Swipe left to <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Swipe right to notifications</string>
 </resources>
diff --git a/packages/SystemUI/res/values-es-rUS/cm_strings.xml b/packages/SystemUI/res/values-es-rUS/cm_strings.xml
index 1ce7517..a3adbbe 100644
--- a/packages/SystemUI/res/values-es-rUS/cm_strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/cm_strings.xml
@@ -29,8 +29,8 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Deslizar a la derecha para %1$s</string>
   <string name="right_shortcut_hint">Deslizar a la izquierda para %1$s</string>
-  <string name="lockscreen_message">Pulsar un icono a la izquierda o derecha para reasignar un atajo de la pantalla bloqueada.</string>
-  <string name="lockscreen_default_target">Predeterminado</string>
+  <string name="lockscreen_message">Pulsa el icono de la izquierda o derecha para reasignar un atajo a la pantalla de bloqueo.</string>
+  <string name="lockscreen_default_target">Predefinido</string>
   <string name="select_application">Selecciona una aplicación</string>
   <string name="lockscreen_choose_action_title">Elegir acción</string>
   <string name="lockscreen_none_target">Ninguna</string>
@@ -67,11 +67,11 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ajustes de luz de notificación</string>
   <string name="led_notification_text">Luz LED activada por ajustes</string>
-  <string name="qs_tile_edit_header_instruction">Pulsa y mantén presionados los mosaicos para reorganizarlos</string>
+  <string name="qs_tile_edit_header_instruction">Mantén pulsado los mosaicos para reorganizarlos</string>
   <string name="quick_settings_edit_label">Editar mosaicos</string>
-  <string name="quick_settings_cannot_delete_edit_tile">No se puede eliminar el mosaico Editar</string>
-  <string name="qs_tiles_reset_confirmation">¿Restaurar lo mosaicos de ajustes rápidos a su configuración predeterminada?</string>
-  <string name="quick_settings_tile_reset_to_default">Restaurar disposición predeterminada</string>
+  <string name="quick_settings_cannot_delete_edit_tile">No se puede borrar el mosaico Editar</string>
+  <string name="qs_tiles_reset_confirmation">¿Restaurar lo mosaicos de ajustes rápidos a su configuración predefinida?</string>
+  <string name="quick_settings_tile_reset_to_default">Restaurar disposición predefinida</string>
   <string name="quick_settings_title_header">Encabezado</string>
   <string name="quick_settings_title_tiles">Mosaicos</string>
   <string name="quick_settings_title_show_weather">Mostrar clima</string>
@@ -80,7 +80,7 @@
   <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Esto fija la pantalla en esta vista hasta que se desancla. Mantén pulsado el botón Atrás para desanclar.</string>
   <string name="quick_settings_custom_tile_detail_title">Control personalizado</string>
-  <string name="quick_settings_remove">Eliminar control</string>
+  <string name="quick_settings_remove">Quitar control</string>
   <string name="quick_settings_network_adb_label">ADB sobre red</string>
   <string name="quick_settings_compass_label">Brújula</string>
   <string name="quick_settings_nfc_label">NFC</string>
@@ -173,9 +173,9 @@
   <string name="quick_settings_dynamic_tile_detail_title">Control dinámico</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próxima alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
-  <string name="dynamic_qs_tile_su_label">Acceso a raíz</string>
+  <string name="dynamic_qs_tile_su_label">Acceso administrativo</string>
   <string name="dynamic_qs_tile_themes_label">Temas</string>
-  <string name="quick_settings_title_advanced_location">Localización trizona</string>
+  <string name="quick_settings_title_advanced_location">Ubicación por triangulación</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">Informes de ubicación: modo de ahorro de batería.</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -203,7 +203,7 @@
   <string name="hotspot_apm_message">No se puede conectar con redes móviles cuando el modo avión está activado. Desactivar el modo avión y volver a intentarlo.</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">La linterna está encendida</string>
-  <string name="quick_settings_tile_flashlight_not_summary">Pulsar para apagarla</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Pulsa para apagar</string>
   <!-- Wi-Fi hotspot label when enabled -->
   <plurals name="wifi_hotspot_connected_clients_label">
     <item quantity="one">%1$d cliente</item>
diff --git a/packages/SystemUI/res/values-fr/cm_strings.xml b/packages/SystemUI/res/values-fr/cm_strings.xml
index 178a379..1d23de7 100644
--- a/packages/SystemUI/res/values-fr/cm_strings.xml
+++ b/packages/SystemUI/res/values-fr/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Prochaine alarme</string>
   <string name="dynamic_qs_tile_ime_selector_label">Mode de saisie</string>
   <string name="dynamic_qs_tile_su_label">Accès root</string>
+  <string name="dynamic_qs_tile_themes_label">Thèmes</string>
   <string name="quick_settings_title_advanced_location">Localisation à trois états</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">Localisation : mode économie de batterie.</string>
@@ -218,4 +219,8 @@
   <!-- 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">Glisser vers le bas pour agrandir</string>
+  <string name="swipe_left_hint">Glisser à gauche pour <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Glisser à droite pour afficher les notifications</string>
 </resources>
diff --git a/packages/SystemUI/res/values-in/cm_strings.xml b/packages/SystemUI/res/values-in/cm_strings.xml
index 6506019..cdf3ea5 100644
--- a/packages/SystemUI/res/values-in/cm_strings.xml
+++ b/packages/SystemUI/res/values-in/cm_strings.xml
@@ -101,7 +101,7 @@
   <string name="accessibility_quick_settings_sync_changed_on">Sinkronisasi dihidupkan.</string>
   <string name="quick_settings_sync_label">Sinkronisasi</string>
   <string name="quick_settings_volume_panel_label">Panel volume</string>
-  <string name="quick_settings_usb_tether_label">Penambatan USB</string>
+  <string name="quick_settings_usb_tether_label">Tethering USB</string>
   <string name="quick_settings_screen_timeout_detail_title">Waktu layar mati</string>
   <string name="quick_settings_lockscreen_label">Kunci layar</string>
   <string name="quick_settings_ambient_display_label">Tampilan ambien</string>
diff --git a/packages/SystemUI/res/values-ko/cm_strings.xml b/packages/SystemUI/res/values-ko/cm_strings.xml
index bcc7dbd..74f83ff 100644
--- a/packages/SystemUI/res/values-ko/cm_strings.xml
+++ b/packages/SystemUI/res/values-ko/cm_strings.xml
@@ -174,6 +174,7 @@
   <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">루트 권한</string>
+  <string name="dynamic_qs_tile_themes_label">테마</string>
   <string name="quick_settings_title_advanced_location">3가지 위치 설정</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>
@@ -199,7 +200,7 @@
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">타일 추가</string>
   <!-- Hotspot dialog message -->
-  <string name="hotspot_apm_message">비행기 모드가 활성화되어 있어 셀룰러 네트워크에 연결할 수 없습니다. 비행기 모드를 해제하고 다시 시도하세요.</string>
+  <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>
@@ -217,4 +218,8 @@
   <!-- 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">아래로 쓸어 내려 확장</string>
+  <string name="swipe_left_hint">왼쪽으로 밀어 <xliff:g id="app_name">%1$s</xliff:g> 실행</string>
+  <string name="swipe_right_hint">오른쪽으로 밀어 알림 열기</string>
 </resources>
diff --git a/packages/SystemUI/res/values-nb/cm_strings.xml b/packages/SystemUI/res/values-nb/cm_strings.xml
index 4a9478f..151785b 100644
--- a/packages/SystemUI/res/values-nb/cm_strings.xml
+++ b/packages/SystemUI/res/values-nb/cm_strings.xml
@@ -104,7 +104,7 @@
   <string name="quick_settings_usb_tether_label">USB tethering</string>
   <string name="quick_settings_screen_timeout_detail_title">Tidsavbrudd for skjermen</string>
   <string name="quick_settings_lockscreen_label">Låseskjerm</string>
-  <string name="quick_settings_ambient_display_label">Ambient skjerm</string>
+  <string name="quick_settings_ambient_display_label">Omgivelsesskjerm</string>
   <string name="quick_settings_lockscreen_label_enforced">Låseskjerm er påkrevd</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Deaktivert av profil</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -142,13 +142,13 @@
   <!-- 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">Låseskjerm slått på.</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">Ambient skjerm av.</string>
+  <string name="accessibility_quick_settings_ambient_display_off">Omgivelsesskjerm av.</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">Ambient skjerm på.</string>
+  <string name="accessibility_quick_settings_ambient_display_on">Omgivelsesskjerm på.</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">Ambient skjerm er skrudd av.</string>
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Omgivelsesskjerm er skrudd av.</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">Ambient skjerm er skrudd på.</string>
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Omgivelsesskjerm 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 varsler er av.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -212,7 +212,7 @@
   <!-- CellularTile data sim not configured state string -->
   <string name="data_sim_not_configured">Ingen data 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">Dokkingstasjonens batteri <xliff:g id="number"> %d</xliff:g> prosent.</string>
+  <string name="accessibility_dock_battery_level">Dokkingstasjonens batteri <xliff:g id="number">%d</xliff:g> prosent.</string>
   <!-- Play queue -->
   <string name="play_queue_extention">Vis avspillingskø</string>
   <!-- Path data for portrait battery -->
diff --git a/packages/SystemUI/res/values-sk/cm_strings.xml b/packages/SystemUI/res/values-sk/cm_strings.xml
index 612b5ac..11e9100 100644
--- a/packages/SystemUI/res/values-sk/cm_strings.xml
+++ b/packages/SystemUI/res/values-sk/cm_strings.xml
@@ -117,7 +117,7 @@
   <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Režim batérie: vyvážený režim.</string>
   <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_perf">Režim batérie: režim výkonu.</string>
+  <string name="accessibility_quick_settings_perf_profile_perf">Režim batérie: vysoký výkon.</string>
   <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Režim batérie: efektívny režim.</string>
   <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -127,11 +127,11 @@
   <!-- 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">Režim batérie sa zmenil na vyvážený režim.</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">Režim batérie sa zmenil na režim výkonu.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">Režim batérie sa zmenil na režim vysokého výkonu.</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">Režim batérie sa zmenil na efektívny režim.</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">Režim batérie sa zmenil na výkonný režim.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Režim batérie sa zmenil na rýchly režim.</string>
   <string name="quick_settings_performance_profile_detail_title">Režim batérie</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">Obrazovka uzamknutia vyp.</string>
diff --git a/packages/SystemUI/res/values-sq-rAL/cm_arrays.xml b/packages/SystemUI/res/values-sq-rAL/cm_arrays.xml
index 44e4c6a..a194d96 100644
--- a/packages/SystemUI/res/values-sq-rAL/cm_arrays.xml
+++ b/packages/SystemUI/res/values-sq-rAL/cm_arrays.xml
@@ -17,6 +17,24 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>V</item>
+    <!-- North -->
+    <item>VL</item>
+    <!-- North east -->
+    <item>L</item>
+    <!-- East -->
+    <item>JL</item>
+    <!-- South east -->
+    <item>J</item>
+    <!-- South -->
+    <item>JP</item>
+    <!-- South west -->
+    <item>P</item>
+    <!-- West -->
+    <item>VP</item>
+    <!-- North west -->
+  </string-array>
   <!-- Performance profiles description-->
   <!-- Performance profiles announcement-->
   <!-- Dynamic tiles -->
diff --git a/packages/SystemUI/res/values-sq-rAL/cm_strings.xml b/packages/SystemUI/res/values-sq-rAL/cm_strings.xml
index b75332c..231a545 100644
--- a/packages/SystemUI/res/values-sq-rAL/cm_strings.xml
+++ b/packages/SystemUI/res/values-sq-rAL/cm_strings.xml
@@ -17,80 +17,209 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
   <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
   <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <!-- Text to use when the number in a notification info is too large
          (greater than status_bar_notification_info_maxnum, defined in
          values/config.xml) and must be truncated.
          [CHAR LIMIT=4] -->
   <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">Rrëshqit gishtin djathtas për %1$s</string>
+  <string name="right_shortcut_hint">Rrëshqit gishtin majtas për %1$s</string>
+  <string name="lockscreen_message">Shtyp një ikonë në të majtë apo të djathtë për të ricaktuar një shkurtore në ekranin bllokues.</string>
+  <string name="lockscreen_default_target">E paracaktuar</string>
+  <string name="select_application">Zgjidh aplikacionin</string>
+  <string name="lockscreen_choose_action_title">Zgjidh veprimin</string>
+  <string name="lockscreen_none_target">Asnjë</string>
   <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">Zgjidh veprimin për ta caktuar</string>
+  <string name="navbar_home_button">Butoni Home</string>
+  <string name="navbar_recent_button">Butoni Të Fundit</string>
+  <string name="navbar_search_button">Butoni i kërkimit</string>
+  <string name="navbar_back_button">Butoni Prapa</string>
+  <string name="navbar_empty_button">Buton bosh</string>
+  <string name="navbar_menu_conditional_button">Butoni i Menusë (fshih automatikisht)</string>
+  <string name="navbar_menu_always_button">Butoni i Menusë (trego gjithmonë)</string>
+  <string name="navbar_menu_big_button">Butoni i Menusë</string>
+  <string name="accessibility_dpad_left">Kursori majtas</string>
+  <string name="accessibility_dpad_right">Kursori djathtas</string>
   <!-- Development shortcuts -->
   <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">Fshi të dhënat e aplikacionit</string>
   <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">Impono mbylljen</string>
   <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">Çinstalo</string>
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Ndriçimi i dritës</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">Profilet inaktive.</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">Profili: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <!-- 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">Profilet u çaktivizuan.</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">Profili u ndërrua në <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <string name="quick_settings_compass_init">Duke u nisur\u2026</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Parametrat e dritës</string>
+  <string name="led_notification_text">Drita LED e aktivizuar nga parametrat</string>
+  <string name="qs_tile_edit_header_instruction">Shtyp dhe mbaj shtypur një tjegull për ta riorganizuar</string>
+  <string name="quick_settings_edit_label">Redakto tjegullat</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Tjegulla \"Redakto\" nuk mund të fshihet</string>
+  <string name="qs_tiles_reset_confirmation">Dëshiron të rikthesh tjegullat në konfigurimin e tyre të paracaktuar?</string>
+  <string name="quick_settings_tile_reset_to_default">Rikthe në pozicionet e paracaktuara</string>
+  <string name="quick_settings_title_tiles">Tjegullat</string>
+  <string name="quick_settings_title_show_weather">Trego motin</string>
+  <string name="quick_settings_title_show_brightness_slider">Trego shiritin e kontrollit të ndriçimit</string>
+  <string name="quick_settings_title_enlarge_first_row">Zmadho rreshtin e parë</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Kjo e mban në ekran derisa ta shqitësh. Shtyp dhe mbaj shtypur butonin Prapa për ta shqitur.</string>
+  <string name="quick_settings_custom_tile_detail_title">Tjegull e personalizuar</string>
+  <string name="quick_settings_remove">Hiq tjegullën</string>
+  <string name="quick_settings_network_adb_label">ADB mbi rrjet</string>
+  <string name="quick_settings_compass_label">Busulla</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">Profilet e sistemit</string>
+  <string name="quick_settings_profiles_off">Profilet janë të çaktivizuar</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">Kursimi i baterisë</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Kursimi i baterisë (duke u karikuar)</string>
+  <string name="quick_settings_caffeine_label">Kafeina</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">Sinkronizimi inaktiv.</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">Sinkronizimi aktiv.</string>
   <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">Sinkronizimi u çaktivizua.</string>
   <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">Sinkronizimi u aktivizua.</string>
+  <string name="quick_settings_sync_label">Sinkronizimi</string>
+  <string name="quick_settings_volume_panel_label">Paneli i volumit</string>
+  <string name="quick_settings_usb_tether_label">USB tethering</string>
+  <string name="quick_settings_screen_timeout_detail_title">Kohëzgjatja e ekranit ndezur</string>
+  <string name="quick_settings_lockscreen_label">Ekrani bllokues</string>
+  <string name="quick_settings_ambient_display_label">Drita e ekranit sipas ambientit</string>
+  <string name="quick_settings_lockscreen_label_enforced">Ekrani bllokues i imponuar</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">I çaktivizuar nga profili</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">Afati kohor i qëndrimit ndezur të ekranit: <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">Afati kohor i qëndrimit ndezur të ekranit u ndryshua në <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <string name="qs_tile_performance">Profili i baterisë</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">Profili i baterisë: kursim i energjisë.</string>
   <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">Profili i baterisë: i balancuar.</string>
   <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">Profili i baterisë: përformancë.</string>
   <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Profili i baterisë: efikasitet.</string>
   <!-- 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">Profili i baterisë: i shpejtë.</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">Profili i baterisë u kthye në profilin e kursimit të energjisë.</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">Profili i baterisë u kthye në profilin e balancuar.</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">Profili i baterisë u kthye në proflin e përformancës.</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">Profili i baterisë u kthye në profilin e efikasitetit.</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">Profili i baterisë u kthye në profilin e shpejtë.</string>
+  <string name="quick_settings_performance_profile_detail_title">Profili i baterisë</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">Ekrani bllokues inaktiv.</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">Ekrani bllokues aktiv.</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">Ekrani bllokues u çaktivizua.</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">Ekrani bllokues u aktivizua.</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">Drita e ekranit sipas ambientit inaktive.</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">Drita e ekranit sipas ambientit aktive.</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">Drita e ekranit sipas ambientit u çaktivizua.</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">Drita e ekranit sipas ambientit u aktivizua.</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 inaktiv.</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 Aktiv.</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">Njoftimet Heads-up u çaktivizuan.</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">Njoftimet Heads-up u aktivizuan.</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">Kafeina inaktive.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Kafeina aktive.</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">Kursimi i baterisë inaktiv.</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">Kursimi i baterisë aktiv.</string>
   <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Kursimi i baterisë u çaktivizua.</string>
   <!-- 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">Kursimi i baterisë u aktivizua.</string>
   <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">Tjegull dinamike</string>
+  <string name="dynamic_qs_tile_next_alarm_label">Alarmi i radhës</string>
+  <string name="dynamic_qs_tile_ime_selector_label">Zgjedhësi IME</string>
+  <string name="dynamic_qs_tile_su_label">Aksesi Root</string>
+  <string name="dynamic_qs_tile_themes_label">Temat</string>
+  <string name="quick_settings_title_advanced_location">Vendndodhja në 3 shtete</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">Raportimi i vendndodhjes: kursim i baterisë.</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">Raportimi i vendndodhjes: vetëm nga sensorët.</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">Raportimi i vendndodhjes: me saktësi të lartë.</string>
   <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">Profili i vendndodhjes</string>
   <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">Kursim i baterisë</string>
   <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">Vetëm pajisja</string>
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">Saktësi e lartë</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">Raportimi i vendndodhjes u kthye në profilin e kursimit të baterisë.</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">Raportimi i vendndodhjes u kthye në profilin \'vetëm sensorët\'.</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">Raportimi i vendndodhjes u kthye në profilin me saktësi të lartë.</string>
+  <string name="quick_settings_tiles_category_system">Tjegullat e sistemit</string>
   <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Shto një tjegull</string>
   <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Lidhja me rrjetet celulare është e pamundur kur profili Avion është i aktivizuar. Çaktivizo profilin Avion dhe provo përsëri.</string>
   <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Elektriku i dorës është i ndezur</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Shtyp për ta fikur</string>
   <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klient</item>
+    <item quantity="other">%1$d klientë</item>
+  </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">SIM pa internet</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">Bateria e Dokut <xliff:g id="number">%d</xliff:g> përqind.</string>
   <!-- Play queue -->
+  <string name="play_queue_extention">Trego këngët në radhë</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">Rrëshqit gishtin poshtë për të shfaqur</string>
+  <string name="swipe_left_hint">Rrëshqit majtas për <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Rrëshqit gishtin djathtas për të parë njoftimet</string>
 </resources>
diff --git a/packages/SystemUI/res/values-sv/cm_strings.xml b/packages/SystemUI/res/values-sv/cm_strings.xml
index 0363610..2230380 100644
--- a/packages/SystemUI/res/values-sv/cm_strings.xml
+++ b/packages/SystemUI/res/values-sv/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Nästa alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME-väljare</string>
   <string name="dynamic_qs_tile_su_label">Root-åtkomst</string>
+  <string name="dynamic_qs_tile_themes_label">Teman</string>
   <string name="quick_settings_title_advanced_location">Tri-state placering</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">Platsrapportering: batterisparläge.</string>
@@ -218,4 +219,5 @@
   <!-- 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>
 </resources>
diff --git a/packages/SystemUI/res/values-uk/cm_strings.xml b/packages/SystemUI/res/values-uk/cm_strings.xml
index 303691c..0f26ff8 100644
--- a/packages/SystemUI/res/values-uk/cm_strings.xml
+++ b/packages/SystemUI/res/values-uk/cm_strings.xml
@@ -33,7 +33,7 @@
   <string name="lockscreen_default_target">За замовчуванням</string>
   <string name="select_application">Вибрати програму</string>
   <string name="lockscreen_choose_action_title">Виберіть дію</string>
-  <string name="lockscreen_none_target">НІчого</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>
@@ -104,7 +104,7 @@
   <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_ambient_display_label">Ambient display</string>
+  <string name="quick_settings_ambient_display_label">Ambient дисплей</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] -->
@@ -142,13 +142,13 @@
   <!-- 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>
   <!-- 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">Ambient display вимкнено.</string>
+  <string name="accessibility_quick_settings_ambient_display_off">Ambient дисплей вимкнено.</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">Ambient display увімкнено.</string>
+  <string name="accessibility_quick_settings_ambient_display_on">Ambient дисплей увімкнено.</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">Ambient дисплей вимкнено.</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">Ambient display увімкнено.</string>
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient дисплей увімкнено.</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">Спливаючі сповіщення вимкнено.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -177,13 +177,13 @@
   <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>
   <!-- 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>
+  <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>
   <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
index 0b882eb..5fe5509 100644
--- a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
@@ -170,7 +170,7 @@
   <!-- 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>
@@ -198,7 +198,7 @@
   <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>
+  <string name="quick_settings_tiles_add_tiles">添加瓷块</string>
   <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">飞行模式启用时无法连接到移动网络。请禁用飞行模式并重试。</string>
   <!-- Notification which notifies user flashlight is enabled -->
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index c47567a..5992346 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -81,7 +81,7 @@
   <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_network_adb_label">透過網路 ADB</string>
   <string name="quick_settings_compass_label">指南針</string>
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">系統設定檔</string>
diff --git a/packages/VpnDialogs/res/values-ast-rES/strings.xml b/packages/VpnDialogs/res/values-ast-rES/strings.xml
index 7b17f14..add38bb 100644
--- a/packages/VpnDialogs/res/values-ast-rES/strings.xml
+++ b/packages/VpnDialogs/res/values-ast-rES/strings.xml
@@ -18,16 +18,8 @@
   <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
   <string name="prompt">Solicitú de conexón</string>
   <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <string name="warning"><xliff:g id="app">%s</xliff:g> quier facer una conexón VPN
-        que permite monitorear el tráficu. Aceuta namái si confíes na fonte.
-        <![CDATA[
-        <br />
-        <br />
-        <img src="vpn_icon" />
-        ]]> apaez arriba na pantalla cuando VPN ta activa.
-    </string>
   <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <string name="legacy_title">VPN coneutada</string>
+  <string name="legacy_title">La VPN ta coneutada</string>
   <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
   <string name="configure">Configurar</string>
   <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
diff --git a/packages/WallpaperCropper/res/values-ast-rES/strings.xml b/packages/WallpaperCropper/res/values-ast-rES/strings.xml
index caa847e..6f16b01 100644
--- a/packages/WallpaperCropper/res/values-ast-rES/strings.xml
+++ b/packages/WallpaperCropper/res/values-ast-rES/strings.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="crop_wallpaper">Recortar el fondu de pantalla</string>
+  <string name="crop_wallpaper">Recortar fondu de pantalla</string>
   <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
   <string name="wallpaper_instructions">Afitar fondu de pantalla</string>
   <!-- Error message when an image is selected as a wallpaper,
-- 
cgit v1.1