Automatic translation importreplicant-6.0-0001

Change-Id: I7f8acca13572a6dff1be53bb7d7fa458cfb9bafd

11 files changed, 285 insertions, 161 deletions

diff --git a/Settings/res/values-ast-rES/arrays.xml b/Settings/res/values-ast-rES/arrays.xml
index 0f92f54b..f2b77410 100644
--- a/Settings/res/values-ast-rES/arrays.xml
+++ b/Settings/res/values-ast-rES/arrays.xml
@@ -16,19 +16,65 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Display settings.  The delay in inactivity before the daydream starts. -->
+  <string-array name="sleep_timeout_entries">
+    <item>5 minutos</item>
+    <item>10 minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>1 hora</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Display settings.  The delay after the daydream starts when the screen goes off. -->
+  <string-array name="screen_off_timeout_entries">
+    <item>30 minutos</item>
+    <item>1 hora</item>
+    <item>3 hores</item>
+    <item>6 hores</item>
+    <item>12 hores</item>
+    <item>Enxamás</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <string-array name="captioning_typeface_selector_titles">
+    <item>Default</item>
+    <item>Sans-serif</item>
+    <item>Sans-serif condensed</item>
+    <item>Sans-serif monospace</item>
+    <item>Serif</item>
+    <item>Serif monospace</item>
+    <item>Casual</item>
+    <item>Cursiva</item>
+    <item>Mayúscules pequeñes</item>
+  </string-array>
   <!-- Values for captioning typeface preference. -->
   <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item>Very small</item>
+    <item>Small</item>
+    <item>Normal</item>
+    <item>Large</item>
+    <item>Very large</item>
+  </string-array>
   <!-- Values for captioning font size preference. -->
   <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
   <!-- Values for captioning character edge type preference. -->
   <!-- Titles for captioning color preference. -->
   <!-- Index to id mapping for captioning color preference. -->
   <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+  <string-array name="captioning_opacity_selector_titles">
+    <item>25%</item>
+    <item>50%</item>
+    <item>75%</item>
+    <item>100%</item>
+  </string-array>
   <!-- Values for captioning opacity preference. -->
   <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <string-array name="captioning_preset_selector_titles">
+    <item>Blancu sobre prietu</item>
+    <item>Prietu sobre blancu</item>
+    <item>Mariellu sobre prietu</item>
+    <item>Mariellu sobre azul</item>
+    <item>Custom</item>
+  </string-array>
   <!-- Values for captioning text style preset preference. -->
 </resources>
diff --git a/Settings/res/values-ast-rES/cm_strings.xml b/Settings/res/values-ast-rES/cm_strings.xml
index ed8c81b7..3c3f12ba 100644
--- a/Settings/res/values-ast-rES/cm_strings.xml
+++ b/Settings/res/values-ast-rES/cm_strings.xml
@@ -46,37 +46,21 @@
   <!-- Setting title for root access -->
   <string name="root_access">Accesu root</string>
   <string name="root_access_warning_title">¿Permitir l\'accesu root?</string>
-  <string name="root_access_warning_message">¡Permitir a les aplicaciones solicitar accesu root ye enforma peligroso y pue comprometer la seguranza del sistema!</string>
-  <string name="root_access_none">Deshabilitáu</string>
+  <string name="root_access_warning_message">¡Permitir que les aplicaciones soliciten l\'accesu root ye enforma peligroso y pue comprometer la seguranza del to sistema!</string>
   <string name="root_access_apps">Namái aplicaciones</string>
   <string name="root_access_adb">Namái ADB</string>
   <string name="root_access_all">Aplicaciones y ADB</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
   <string name="enable_terminal_title">Terminal llocal</string>
-  <string name="enable_terminal_summary">Habilitar aplicación de terminal qu\'ufre accesu a shell llocal</string>
   <!-- Display settings -->
-  <string name="system_display">Pantalla</string>
-  <string name="system_display_overscan">Overscan</string>
-  <string name="system_display_overscan_description">Calibra la pantalla p\'axustala al to tamañu de pantalla.</string>
   <!-- Home settings -->
-  <string name="system_reset_default_home">Reafitar la pantalla d\'aniciu por defeutu</string>
-  <string name="system_home_settings">Axustes del aniciu</string>
-  <string name="reset_launcher_title">Reafitar la pantalla d\'aniciu por defeutu</string>
-  <string name="reset_launcher_description">Al reafitar la pantalla d\'aniciu vas poder escoyer una pantalla d\'aniciu alternativa (p.ex Trebuchet).\n\n¿Quies reafitar la pantalla d\'aniciu por defeutu?</string>
-  <string name="reset_launcher_tip">Primi\'l botón d\'aniciu pa qu\'apaez\'l cuadru de diálogu de seleición de pantalla d\'aniciu</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">Reaniciu avanzáu</string>
-  <string name="advanced_reboot_summary">Incluyir opciones nel menú pa reaniciar en mou recovery, bootloader o facer un reaniciu rápidu</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
-  <string name="reboot_recovery_button_label">Recovery</string>
   <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader_button_label">Cargador d\'arranque</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft_button_label">Reaniciu suave</string>
   <!-- Android debugging over WiFi -->
-  <string name="adb_over_network">ADB sobre rede</string>
-  <string name="adb_over_network_summary">Activar la depuración TCP/IP sobre les interfaces de rede (Wi\u2011Fi, redes USB). Esta configuración reafítase al reaniciar el preséu</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">AVISU: Cuando ta habilitáu ADB sobre rede, ¡la to TV ta abierta a intrusiones en toles redes coneutaes!.\n\nUsa esta función namái al tar coneutáu a redes d\'enfotu.\n\n¿Daveres quies activar esta función?</string>
 </resources>
diff --git a/Settings/res/values-ast-rES/strings.xml b/Settings/res/values-ast-rES/strings.xml
index 4137195c..e305dfe4 100644
--- a/Settings/res/values-ast-rES/strings.xml
+++ b/Settings/res/values-ast-rES/strings.xml
@@ -16,21 +16,29 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Main app title [CHAR LIMIT=40] -->
+  <string name="settings_app_name">Axustes</string>
   <!-- Leanback Launcher App Title for main Settings app [CHAR LIMIT=40] -->
+  <string name="launcher_settings_app_name">Axustes</string>
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
   <!-- Header title for device [CHAR LIMIT=50] -->
+  <string name="header_category_device">Preséu</string>
   <!-- Header title for preferences [CHAR LIMIT=50] -->
+  <string name="header_category_preferences">Preferencies</string>
   <!-- Header title for accessories [CHAR LIMIT=50] -->
+  <string name="header_category_accessories">Mandu y accesorios</string>
   <!-- Header title for personal [CHAR LIMIT=50] -->
+  <string name="header_category_personal">Personal</string>
   <!-- Account preferences -->
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
+  <string name="add_account">Amestar cuenta</string>
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
   <!-- Sync item label: control sync settings [CHAR LIMIT=100] -->
   <!-- Label for action to sync now [CHAR LIMIT=50] -->
   <!-- Label for action saying that we are syncing now [CHAR LIMIT=50] -->
+  <string name="sync_cancel">Encaboxar sincronización</string>
   <!-- Sync status: in progress [CHAR LIMIT=50]-->
   <!-- Sync status: last synced [CHAR LIMIT=50]-->
   <!-- Sync status: disabled [CHAR LIMIT=50] -->
@@ -42,48 +50,56 @@
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
   <!-- Title for always scan wifi. [CHAR LIMIT=50] -->
-  <string name="wifi_setting_always_scan">Busca siempre disponible</string>
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
-  <string name="wifi_setting_always_scan_context">Dexa que\'l serviciu d\'allugamientu de Google y otres aplicaciones gueten redes, incluso tando\'l Wi-Fi apagáu</string>
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages apps. [CHAR LIMIT=50] -->
+  <string name="device_apps">Aplicaciones</string>
   <!-- Preference which shows storage status. [CHAR LIMIT=50] -->
+  <string name="device_storage_reset">Almacenamientu y reafitamientu</string>
   <!-- Preference which shows storage status. [CHAR LIMIT=50] -->
   <!-- Preference which manages backup settings. [CHAR LIMIT=50] -->
+  <string name="device_backup_restore">Respaldu y restauración</string>
   <!-- Preference which shows reset options [CHAR LIMIT=50] -->
   <!-- Preference which sets the device's display calibration. [CHAR LIMIT=50] -->
   <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
   <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
   <!-- Browse Header for downloaded apps under device settings. [CHAR LIMIT=50] -->
+  <string name="apps_downloaded">Aplicaciones baxaes</string>
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
+  <string name="apps_system">Aplicaciones del sistema</string>
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
+  <string name="apps_running">Aplicaciones n\'execución</string>
   <!-- Remote and Accessories -->
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
+  <string name="accessories_add">Amestar accesoriu</string>
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Connecting. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Error. [CHAR LIMIT=50] -->
+  <string name="accessory_state_error">Nun pudo empareyase</string>
   <!-- Device Paring Status: Canceled. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing Complete. [CHAR LIMIT=50] -->
   <!-- Preference which manages a single Paired Bluetooth accessory. [CHAR LIMIT=50] -->
   <!-- Preference for renaming a paired Bluetooth accessory[CHAR LIMIT=50] -->
   <!-- Preference for unpairing a Bluetooth accessory[CHAR LIMIT=50] -->
   <!-- Preference for displaying battery level percentage. % symbol if used must be escaped as %% [CHAR LIMIT=150] -->
-  <string name="accessory_battery">Batería <xliff:g id="percentage">%1$d</xliff:g>%%</string>
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
+  <string name="accessory_unpairing">Desempareyando preséu&#8230;</string>
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
+  <string name="accessories_add_title">Guetando accesorios&#8230;</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
   <!-- Description text for pairing screen with multiple devices found. [CHAR LIMIT=150] -->
   <!-- Description text for selecting a device to pair, when multiple devices are detected. [CHAR LIMIT=150] -->
   <!-- Description text for pairing with the selected device, when multiple devices are detected. [CHAR LIMIT=150] -->
   <!-- Error message displayed to the user indicating that a selected action is not supported on this device. [CHAR LIMIT=150] -->
+  <string name="error_action_not_supported">Esta aición nun ta sofitada</string>
   <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
   <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
   <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing [CHAR LIMIT=NONE] -->
@@ -93,17 +109,24 @@
   <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
+  <string name="bluetooth_cancel">Encaboxar</string>
   <!-- System -->
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
+  <string name="system_date_time">Data y hora</string>
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
+  <string name="system_language">Llingua</string>
   <!-- Preference which manages input method settings. [CHAR LIMIT=50] -->
+  <string name="system_keyboard">Tecláu</string>
   <!-- Preference which manages home screen settings. [CHAR LIMIT=50] -->
+  <string name="system_home">Pantalla d\'aniciu</string>
   <!-- Preference which manages search and google now settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages security settings. [CHAR LIMIT=50] -->
+  <string name="system_security">Seguranza y torgues</string>
   <!-- Preference which manages speech recognition settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages TV inputs. [CHAR LIMIT=50] -->
   <!-- Preference which manages accessibility settings. [CHAR LIMIT=50] -->
+  <string name="system_accessibility">Accesibilidá</string>
   <!-- Preference which manages developer options. [CHAR LIMIT=50] -->
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
@@ -111,61 +134,85 @@
   <!-- About -->
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
+  <string name="about_preference">Tocante a</string>
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
   <!-- Button to reboot the device [CHAR LIMIT=40] -->
   <!-- Preference which shows legal info. [CHAR LIMIT=50] -->
   <!-- Preference which shows open source licenses [CHAR LIMIT=50]-->
+  <string name="about_legal_license">Llicencies de códigu abiertu</string>
   <!-- Preference which shows terms of service and privacy info [CHAR LIMIT=50]-->
   <!-- Toast message displayed if the license data is unavailable [CHAR LIMIT=100] -->
   <!-- Preference which shows model. [CHAR LIMIT=50] -->
   <!-- Preference which shows version. [CHAR LIMIT=50] -->
   <!-- Preference which shows serial number. [CHAR LIMIT=50] -->
+  <string name="about_serial">Númberu de serie</string>
   <!-- Preference which shows build version. [CHAR LIMIT=50] -->
   <!-- Device Info screen. Countdown for user taps to enable development settings [CHAR LIMIT=NONE] -->
   <!-- Preference which shows ads settings. [CHAR LIMIT=50] -->
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
+  <string name="show_dev_already">Nun se precisa, yá yes un desendolcador</string>
   <!-- Wifi -->
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
+  <string name="title_mac_address">Direición MAC</string>
   <!-- label signal strength [CHAR LIMIT=50] -->
+  <string name="title_signal_strength">Fuercia de señal</string>
   <!-- label IP address [CHAR LIMIT=50] -->
+  <string name="title_ip_address">Direición IP</string>
   <!-- label SSID [CHAR LIMIT=50] -->
   <!-- label internet connection [CHAR LIMIT=50] -->
+  <string name="title_internet_connection">Conexón d\'internet</string>
   <!-- contents for connection status -->
   <!-- Connected [CHAR LIMIT=50] -->
   <!-- Not connected [CHAR LIMIT=50] -->
   <!-- Wifi setting headers [CHAR LIMIT=50] -->
+  <string name="wifi_setting_available_networks">REDES DISPONIBLES</string>
   <!-- Other Options under Wifi Settings headers [CHAR LIMIT=50] -->
   <!-- Strings for Add Network under Connectivity Setting -->
   <!-- Security type title on add network form page [CHAR LIMIT=30] -->
+  <string name="security_type">Triba de seguranza</string>
   <!-- Title for connecting to a WPS network in setup mode [CHAR LIMIT=30] -->
   <!-- Title for adding hidden network in setup mode [CHAR LIMIT=30] -->
   <!-- Skip configuring a Wi-Fi network during device setup [CHAR LIMIT=30]-->
   <!-- Wifi Security type indicating no security [CHAR LIMIT=30] -->
+  <string name="wifi_security_type_none">Denguna</string>
   <!-- Wifi Security type indicating WEP security [CHAR LIMIT=30] -->
+  <string name="wifi_security_type_wep">WEP</string>
   <!-- Wifi Security type indicating WPA/WPA2 security [CHAR LIMIT=30] -->
+  <string name="wifi_security_type_wpa">WPA/WPA2 PSK</string>
   <!-- Wifi Security type indicating EAP security [CHAR LIMIT=30] -->
+  <string name="wifi_security_type_eap">802.1x EAP</string>
   <!-- Title to show when no wifi networks are available [CHAR LIMIT=80] -->
   <!-- Title to show when wifi fails to save [CHAR LIMIT=80] -->
   <!-- Title to show when wifi fails to connect [CHAR LIMIT=80] -->
   <!-- Title to show when wifi fails to connect due to timeout [CHAR LIMIT=80] -->
   <!-- Title to show when wifi fails to connect due to authentication failure [CHAR LIMIT=80] -->
   <!-- Title to show when the wifi ap rejects the connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_could_not_connect_ap_reject">La rede Wi-Fi nun aceutó la conexón</string>
   <!-- Title to show when asking if advanced settings should be used for this wifi connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_advanced_options">¿Configurar l\'axuste d\'IP y proxy de <xliff:g id="ssid">%1$s</xliff:g>?</string>
   <!-- Title to show when asking if a proxy should be used for this wifi connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_proxy_settings">Axustes de proxy</string>
   <!-- Title to show when asking for the proxy hostname for this wifi connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_proxy_hostname">Nome d\'agospiu de proxy:</string>
   <!-- Title to show when asking for the proxy port for this wifi connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_proxy_port">Puertu de proxy:</string>
   <!-- Title to show when asking for which domains bypass the proxy for this wifi connection [CHAR LIMIT=80] -->
   <!-- Title to show when asking how an ip should be assigned for this wifi connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_ip_settings">Axuste d\'IP</string>
   <!-- Title to show when asking for the static ip address to use for this wifi connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_ip_address">Direición IP:</string>
   <!-- Title to show when asking for the gateway's ip address for this wifi connection [CHAR LIMIT=80] -->
   <!-- Title to show when asking for the network prefix length for this wifi connection [CHAR LIMIT=80] -->
   <!-- Title to show when asking for the first DNS to use for this wifi connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_dns1">DNS 1:</string>
   <!-- Title to show when asking for the second DNS to use for this wifi connection [CHAR LIMIT=80] -->
+  <string name="title_wifi_dns2">DNS 2:</string>
   <!-- Title to show when the proxy settings are invalid [CHAR LIMIT=80] -->
   <!-- Title to show when the ip settings are invalid [CHAR LIMIT=80] -->
+  <string name="title_wifi_ip_settings_invalid">Axustes IP non válidos</string>
   <!-- Title to show when the ip settings are invalid [CHAR LIMIT=80] -->
   <!-- Label for action to try to connect to wifi again [CHAR LIMIT=50] -->
   <!-- Label for action to go back to the list of wifi networks [CHAR LIMIT=50] -->
@@ -173,18 +220,25 @@
   <!-- Message to show when wifi is saving a new configuration [CHAR LIMIT=80] -->
   <!-- Title for action to connect to the wifi network [CHAR LIMIT=80] -->
   <!-- Title for action to forget the wifi network configuration [CHAR LIMIT=80] -->
+  <string name="wifi_forget_network">Escaecer rede</string>
   <!-- Description for action to forget the wifi network configuration [CHAR LIMIT=100] -->
   <!-- Label for action to accept the currently connected wifi network [CHAR LIMIT=50] -->
+  <string name="wifi_action_ok">ACEUTAR</string>
   <!-- Label for action to try to connect to a different wifi network [CHAR LIMIT=50] -->
   <!-- Label for action to not try to connect to a different wifi network [CHAR LIMIT=50] -->
   <!-- Label for action to use advanced settings for the wifi connection [CHAR LIMIT=50] -->
+  <string name="wifi_action_advanced_yes">ACEUTAR</string>
   <!-- Label for action to not use advanced settings for the wifi connection [CHAR LIMIT=50] -->
   <!-- Label for action to not use a proxy for the wifi connection [CHAR LIMIT=50] -->
   <!-- Label for action to setup a proxy for the wifi connection [CHAR LIMIT=50] -->
+  <string name="wifi_action_proxy_manual">Manual</string>
   <!-- Label for action to use dhcp to obtain an ip address for the wifi connection [CHAR LIMIT=50] -->
+  <string name="wifi_action_dhcp">DHCP</string>
   <!-- Label for action to setup static ip information for the wifi connection [CHAR LIMIT=50] -->
   <!-- Title for action to show status information for the wifi connection [CHAR LIMIT=50] -->
+  <string name="wifi_action_status_info">Información d\'estáu</string>
   <!-- Title for action to setup advanced options for the wifi connection [CHAR LIMIT=50] -->
+  <string name="wifi_action_advanced_options_title">Opciones avanzaes</string>
   <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
   <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
   <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
@@ -199,21 +253,28 @@
   <!-- HTTP proxy settings. Error msg -->
   <!-- HTTP proxy settings. Error msg -->
   <!-- HTTP proxy settings. Error msg -->
+  <string name="proxy_error_invalid_port">El puertu nun ye válidu</string>
   <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
   <!-- HTTP proxy settings. The hint text field for port. -->
   <!-- HTTP proxy settings. The hint text for proxy exclusion list.-->
   <!-- HTTP proxy settings. The hint text field for the hostname. -->
   <!-- Title to show indicating the user is connected [CHAR LIMIT=100] -->
+  <string name="wifi_summary_title_connected">Rede coneutada</string>
   <!-- Title to show indicating the user is not connected [CHAR LIMIT=100] -->
+  <string name="wifi_summary_title_not_connected">La rede nun ta coneutada</string>
   <!-- Title to show when wifi is already connected [CHAR LIMIT=100] -->
   <!-- Name to use when we don't know the name of the wifi network the device is connected to [CHAR LIMIT=20] -->
+  <string name="wifi_summary_unknown_network">una rede desconocida</string>
   <!-- Strings for Ethernet under Connectivity Setting -->
   <!-- Title for OK [CHAR LIMIT=50] -->
+  <string name="title_ok">ACEUTAR</string>
   <!-- Title for DNS 2 [CHAR LIMIT=50] -->
+  <string name="title_cancel">Encaboxar</string>
   <!-- Storage settings screen heading. This is displayed above items that pertain to the phone's internal storage [CHAR LIMIT=50] -->
   <!-- Storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. [CHAR LIMIT=50] -->
   <!-- Storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section [CHAR LIMIT=50] -->
   <!-- Storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+  <string name="storage_calculating_size">Calculando\u2026</string>
   <!-- Storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
   <!-- Storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
   <!-- Storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
@@ -221,163 +282,123 @@
   <!-- Storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
   <!-- Storage settings title. Displayed as a title when showing the total usage of all cached data on device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
   <!-- Storage settings eject action [CHAR LIMIT=50] -->
-  <string name="storage_eject">Espulsar</string>
   <!-- Storage settings erase and format action [CHAR LIMIT=50] -->
-  <string name="storage_format">Desaniciar y formatiar</string>
   <!-- Storage settings format for internal storage action [CHAR LIMIT=50] -->
-  <string name="storage_format_for_private">Formatiar como almacenamientu del preséu</string>
   <!-- Description for a storage volume which is not currently connected to the device -->
   <!-- Storage settings migrate primary storage action [CHAR_LIMIT=50] -->
-  <string name="storage_migrate">Migrar los datos</string>
   <!-- Storage settings forget action [CHAR_LIMIT=50] -->
   <string name="storage_forget">Escaecer esti almacenamientu internu</string>
   <!-- Storage settings forget description [CHAR_LIMIT=NONE] -->
-  <string name="storage_forget_wall_of_text">Pa usar les aplicaciones o los datos que contién esti mediu, vuelvi inxertalu. De mou alternativu, si\'l mediu nun ta disponible, pues escoyer desaniciar esti almacenamientu.\n\nSi quies facelo, van perdese tolos datos guardaos nel mediu de mou permanente.\n\nVas poder volver instalar les aplicaciones llueu, pero van perdese los datos almacenaos nesti mediu.</string>
   <!-- Header title for device storage [CHAR_LIMIT=50] -->
-  <string name="storage_device_storage_section">Almacenamientu del preséu</string>
   <!-- Header title for removable storage [CHAR_LIMIT=50] -->
-  <string name="storage_removable_storage_section">Almacenamientu estrayible</string>
   <!-- Header title for device reset [CHAR_LIMIT=50] -->
-  <string name="storage_reset_section">Restablecer</string>
   <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
-  <string name="storage_mount_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> ta montáu</string>
   <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
-  <string name="storage_mount_failure">Nun pue montase <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
-  <string name="storage_unmount_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> espulsóse de mou seguru</string>
   <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
-  <string name="storage_unmount_failure"><xliff:g id="name" example="SD card">%1$s</xliff:g> nun pudo espulsase de mou seguru</string>
   <!-- Toast informing that storage unmount operation failed because the volume couldn't be found. [CHAR LIMIT=64]-->
-  <string name="storage_unmount_failure_cant_find">Nun pudo alcontrase la unidá pa espulsar</string>
   <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
-  <string name="storage_format_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> formatióse</string>
   <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
-  <string name="storage_format_failure">Nun pudo formatiase <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Title for wizard screen for formatting storage as internal [CHAR LIMIT=64] -->
-  <string name="storage_wizard_format_as_private_title">Formatiar como almacenamientu internu</string>
   <!-- Description for wizard screen for formatting storage as internal [CHAR LIMIT=NONE] -->
-  <string name="storage_wizard_format_as_private_description">Tienes de formatiar la unidá USB pa que funcione de mou seguru. Al finar el procesu, la unidáu namái va funcionar nesti preséu. Si la formaties, van desaniciase tolos datos almacenaos nella. Pa evitar la perda de datos, pues facer una copia de seguranza.</string>
   <!-- Title for wizard screen for formatting storage as internal [CHAR LIMIT=64] -->
-  <string name="storage_wizard_format_as_public_title">Desaniciar y formatiar</string>
   <!-- Description for wizard screen for formatting storage as internal [CHAR LIMIT=NONE] -->
-  <string name="storage_wizard_format_as_public_description">Dempues de formatiala, vas poder usar esta unidá USB n\'otros preseos. Van desaniciase tolos datos. Considera crear una copia de seguranza primero. Pa ello, muevi les aplicaciones a otru almacenamientu internu.</string>
   <!-- Title for wizard progress screen for formatting drive [CHAR_LIMIT=50] -->
-  <string name="storage_wizard_format_progress_title">Formatiando la unidá USB&#8230;</string>
   <!-- Description for wizard progress screen for formatting drive [CHAR_LIMIT=NONE] -->
-  <string name="storage_wizard_format_progress_description">Esti procesu pue llevar unos minutos. Nun quites la unidá.</string>
   <!-- Title for wizard confirmation screen for migrating data to new drive [CHAR_LIMIT=50] -->
-  <string name="storage_wizard_migrate_confirm_title">Tresferir datos a <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Description for wizard confirmation screen for migrating data to new drive [CHAR_LIMIT=NONE] -->
-  <string name="storage_wizard_migrate_confirm_description">Tresfier les tos semeyes, ficheros y datos de les apps a <xliff:g id="name" example="SD card">%1$s</xliff:g>. Esto pue llevar unos minutos. Dalgunes apps nun van funcionar correutamente mentanto la tresferencia.</string>
   <!-- Positive action for wizard confirmation screen for migrating data to new drive [CHAR_LIMIT=50] -->
-  <string name="storage_wizard_migrate_confirm_action_move_now">Mover agora</string>
   <!-- Negative action for wizard confirmation screen for migrating data to new drive [CHAR_LIMIT=50] -->
-  <string name="storage_wizard_migrate_confirm_action_move_later">Mover más sero</string>
   <!-- Success toast for migrating data [CHAR_LIMIT=100] -->
-  <string name="storage_wizard_migrate_toast_success">Datos migraos a <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Failure toast for migrating data [CHAR_LIMIT=100] -->
-  <string name="storage_wizard_migrate_toast_failure">Nun pudiero migrase los datos a <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Title for wizard progress screen for migrating data to new drive [CHAR_LIMIT=50] -->
-  <string name="storage_wizard_migrate_progress_title">Tresfiriendo datos a <xliff:g id="name" example="SD card">%1$s</xliff:g>&#8230;</string>
   <!-- Description for wizard progress screen for migrating data to new drive [CHAR_LIMIT=NONE] -->
-  <string name="storage_wizard_migrate_progress_description">Esta aición pue llevar un momentu. Nun quites la unidá.\nDalgunes apps nun van funcionar de mou correutu mentanto la tresferencia.</string>
   <!-- Title for warning dialog for slow drives [CHAR_LIMIT=64] -->
-  <string name="storage_wizard_format_slow_title">Esta unidá paez ser lenta.</string>
   <!-- Summary for warning dialog for slow drives [CHAR_LIMIT=NONE] -->
-  <string name="storage_wizard_format_slow_summary">Pues continuar, pero ye dable que les apps que muevas a esta llocalización se vuelvan inestables y la tresferencia de datos lleve más tiempu. Considera usar una unidá más rápida p\'ameyorar el rindimientu.</string>
   <!-- Format action for wizard screen for formatting storage [CHAR LIMIT=50] -->
-  <string name="storage_wizard_format_action">Formatiar</string>
   <!-- Back up apps action for wizard screen for formatting storage [CHAR LIMIT=50]-->
-  <string name="storage_wizard_backup_apps_action">Crear copia de seguranza pa apps</string>
   <!-- Back up apps title [CHAR LIMIT=50] -->
-  <string name="storage_wizard_back_up_apps_title">Aplicaciones atroxaes en <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Back up apps title [CHAR LIMIT=50] -->
-  <string name="storage_wizard_back_up_apps_and_data_title">Aplicaciones y datos atroxaos en <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Back up apps storage available description [CHAR_LIMIT=50] -->
   <string name="storage_wizard_back_up_apps_space_available"><xliff:g id="size" example="1.23GB">%1$s</xliff:g> disponibles</string>
   <!-- Title for wizard screen for ejecting internal storage [CHAR LIMIT=64] -->
-  <string name="storage_wizard_eject_internal_title">Espulsar almacenamientu internu</string>
   <!-- Description for wizard screen for ejecting internal storage [CHAR LIMIT=NONE] -->
-  <string name="storage_wizard_eject_internal_description">Les apps que s\'almacenaron nesti preséu van dexar de funcionar cuando s\'espulse. Esta unidá USB ta formatiada pa funcionar namái nesti preséu y nun va funcionar n\'otros.</string>
   <!-- Title for wizard progress screen for ejecting a drive [CHAR_LIMIT=64] -->
-  <string name="sotrage_wizard_eject_progress_title">Espulsando <xliff:g id="name" example="SD Card">%1$s</xliff:g>&#8230;</string>
   <!-- Title for wizard screen for moving apps [CHAR_LIMIT=50] -->
-  <string name="storage_wizard_move_app_title">Almacenamientu usáu</string>
   <!-- Title for wizard progress screen for moving apps [CHAR_LIMIT=50] -->
-  <string name="storage_wizard_move_app_progress_title">Moviendo <xliff:g id="name" example="YouTube">%1$s</xliff:g>&#8230;</string>
   <!-- Description for wizard progress screen for moving apps [CHAR_LIMIT=NONE] -->
-  <string name="storage_wizard_move_app_progress_description">Nun saques la unidá mentanto\'l procesu.\nL\'aplicación <xliff:g id="appname" example="YouTube">%1$s</xliff:g> va tar disponible nesti preséu cuando se complete la tresferencia.</string>
   <!-- Title for wizard screen for forgetting private storage [CHAR_LIMIT=50] -->
   <string name="storage_wizard_forget_confirm_title">¿Escaecer almacenamientu internu?</string>
   <!-- Description for wizard screen for forgetting private storage [CHAR_LIMIT=NONE] -->
-  <string name="storage_wizard_forget_confirm_description">Al esbillar \'Escaecer\' van perdese tolos datos almacenaos nesa unidá de mou permanente. ¿Quies continuar?</string>
   <!-- Action for wizard screen for forgetting private storage [CHAR_LIMIT=50] -->
   <string name="storage_wizard_forget_action">Escaecer</string>
   <!-- Title for new storage activity [CHAR_LIMIT=50] -->
-  <string name="storage_new_title">Unidá USB coneutada</string>
   <!-- Browse action for new storage activity [CHAR_LIMIT=50] -->
-  <string name="storage_new_action_browse">Restolar</string>
   <!-- Adopt action for new storage activity [CHAR_LIMIT=50] -->
-  <string name="storage_new_action_adopt">Configurar como almacenamientu internu</string>
   <!-- Format as removable action for new storage activity [CHAR_LIMIT=50] -->
-  <string name="storage_new_action_format_public">Configurar como almacenamientu estrayible</string>
   <!-- Eject action for new storage activity [CHAR_LIMIT=50] -->
-  <string name="storage_new_action_eject">Espulsar</string>
   <!-- Title for missing storage activity shown when a drive is removed [CHAR_LIMIT=50] -->
-  <string name="storage_missing_title">Estráxose la unidá <xliff:g id="name" example="SD Card">%1$s</xliff:g></string>
   <!-- Description for missing storage activity shown when a drive is removed [CHAR_LIMIT=NONE] -->
-  <string name="storage_missing_description">Delles aplicaciones nun sedrán o furrularán correutamente fasta que se reconeute la unidá.</string>
+  <string name="storage_missing_description">Delles aplicaciones nun sedrán o funcionar correutamente fasta que se reconeute la unidá.</string>
   <!-- Manage applications, text for move error messages -->
-  <string name="insufficient_storage">Nun hai espaciu d\'almacenamientu abondo.</string>
-  <string name="does_not_exist">L\u2019aplicación nun esiste.</string>
-  <string name="app_forward_locked">L\u2019aplicación ta protexida escontra copies.</string>
-  <string name="invalid_location">L\u2019allugamientu d\u2019instalación nun ye válidu.</string>
-  <string name="system_package">Los anovamientos del sistema nun pue instalase en medios esternos.</string>
   <!-- Learn more action title [CHAR_LIMIT=50] -->
-  <string name="learn_more_action">Depriendi más</string>
+  <string name="learn_more_action">Deprendi más</string>
   <!-- Action to retry WPS scanning [CHAR LIMIT=50] -->
   <!-- Message indicating we are scanning for WPS routers [CHAR LIMIT=150] -->
   <!-- Message describing how to turn on WPS on a router [CHAR LIMIT=150] -->
   <!-- Title Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
   <!-- Description Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
   <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <string name="wifi_wps_failed_generic">Nun pudo alcontrase\'l router Wi-Fi</string>
   <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
   <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
   <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
   <!-- Title for Date in System Settings Date Time [CHAR LIMIT=50] -->
+  <string name="system_date">Data</string>
   <!-- Title for Time in System Settings Date Time [CHAR LIMIT=50] -->
   <!-- Title for Set Date in System Settings Date Time [CHAR LIMIT=50] -->
+  <string name="system_set_date">Afitar data</string>
   <!-- Title for Set Time in System Settings Date Time [CHAR LIMIT=50] -->
+  <string name="system_set_time">Afitar hora</string>
   <!-- Title for Set Time Zone in System Settings Date Time [CHAR LIMIT=50] -->
   <!-- Format string for displaying the current time zone, eg "GMT-08:00, Pacific Standard Time" [CHAR LIMIT=10] -->
-  <string name="desc_set_time_zone"><xliff:g id="offset" example="GMT-08:00">%1$s</xliff:g>, <xliff:g id="name" example="Pacific Standard Time">%2$s</xliff:g></string>
   <!-- Title for Set time format in System Settings Date Time [CHAR LIMIT=50] -->
+  <string name="system_set_time_format">Usar formatu de 24 hores</string>
   <!-- Format string for displaying the current time format (12/24 hour) [CHAR LIMIT=10] -->
   <string name="desc_set_time_format"><xliff:g id="state" example="Off">%1$s</xliff:g> (<xliff:g id="sample" example="3:14 PM">%2$s</xliff:g>)</string>
   <!-- Title for automatic date & time [CHAR LIMIT = 80] -->
+  <string name="system_auto_date_time">Hora y data automátiques</string>
   <!-- Description for using automatic date & time in date time settings [CHAR LIMIT=100] -->
+  <string name="desc_auto_date_time">Usa la hora fornida pola rede</string>
   <!-- Title for Location in System Settings [CHAR LIMIT=50] -->
+  <string name="system_location">Allugamientu</string>
   <!-- Description for Location in System Settings [CHAR LIMIT=NONE] -->
   <!-- Title for confirming location consent [CHAR LIMIT=50] -->
   <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <string name="location_mode_title">Mou</string>
   <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
   <!-- Location settings screen, displayed when there's no recent app accessing location -->
   <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
   <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
   <!-- [CHAR LIMIT=130] Location mode screen, description for wifi mode -->
   <!-- [CHAR LIMIT=60] Label for the status of location -->
+  <string name="location_status">Estáu d\'allugamientu</string>
   <!-- [CHAR LIMIT=60] Title for location services in locations settings -->
   <!-- [CHAR LIMIT=20] Title for status on for location services -->
   <!-- [CHAR LIMIT=20] Title for status off for location services -->
   <!-- [CAR LIMIT=100] Location services screen title for Google location services -->
+  <string name="google_location_services_title">Servicios d\'allugamientu de Google</string>
   <!-- [CAR LIMIT=100] Location services screen title for third party location services -->
   <!-- [CHAR LIMIT=100] Location services screen, title for Location reporting -->
+  <string name="location_reporting">Informe d\'allugamientu</string>
   <!-- [CHAR LIMIT=100] Location services screen, title for Location history -->
+  <string name="location_history">Historial d\'allugamientos</string>
   <!-- [CHAR LIMIT=300] Location reporting screen, description -->
   <!-- [CHAR LIMIT=500] Location history screen, description -->
   <!-- [CHAR LIMIT=100] Location history screen, title for delete location history -->
   <!-- [CHAR LIMIT=300] Location history screen, description for delete location history -->
   <!-- Title for services in accessibility settings [CHAR LIMIT=50] -->
+  <string name="system_services">Servicios</string>
   <!-- Title and description for accessibility service setting [CHAR LIMIT=50] -->
   <!-- Title and description for accessibility captions setting [CHAR LIMIT=50] -->
   <!-- Title and description for accessibility captions description [CHAR LIMIT=NONE] -->
@@ -387,6 +408,7 @@
   <!-- Description for captions display setting [CHAR LIMIT=100] -->
   <!-- Title for captions configure setting [CHAR LIMIT=50] -->
   <!-- Title for captions language setting [CHAR LIMIT=50] -->
+  <string name="captions_lanaguage">Llingua</string>
   <!-- Title for captions text size setting [CHAR LIMIT=50] -->
   <!-- Title for captions style setting [CHAR LIMIT=50] -->
   <!-- Title for custom captions settings [CHAR LIMIT=50] -->
@@ -403,13 +425,19 @@
   <!-- Label for the color white. [CHAR LIMIT=35] -->
   <!-- Label for the color black. [CHAR LIMIT=35] -->
   <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <string name="color_red">Bermeyu</string>
   <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <string name="color_green">Verde</string>
   <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <string name="color_blue">Azul</string>
   <!-- Label for the color cyan. [CHAR LIMIT=35] -->
   <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <string name="color_yellow">Mariellu</string>
   <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <string name="color_magenta">Maxenta</string>
   <!-- Title for accessibility service status [CHAR LIMIT=50] -->
   <!-- Title for accessibility service configuration [CHAR LIMIT=50] -->
+  <string name="system_accessibility_config">Configuración</string>
   <!-- Title for confirmation screen when turning ON accessibility service[CHAR LIMIT=50] -->
   <!-- Description for confirmation screen when turning ON accessibility service[[CHAR LIMIT=NONE] -->
   <!-- Title for confirmation screen when turning OFF accessibility service[CHAR LIMIT=50] -->
@@ -422,14 +450,18 @@
   <!-- Title for Set Install voice data in System Settings Accessibility [CHAR LIMIT=50] -->
   <!-- Title for Set General in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set Debugging in System Settings Developer options [CHAR LIMIT=50] -->
+  <string name="system_debugging">Depuración</string>
   <!-- Title for Set Input in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set Drawing in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set Monitoring in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set Apps in System Settings Developer options [CHAR LIMIT=50] -->
+  <string name="system_apps">Aplicaciones</string>
   <!-- Title for Set Stay awake in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set HDCP checking in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for HDMI optimization in System Settings Developer options [CHAR LIMIT=50] -->
+  <string name="system_hdmi_optimization">Optimización de HDMI</string>
   <!-- Title for reboot confirmation in System Settings Developer options [CHAR LIMIT=50] -->
+  <string name="system_reboot_confirm">¿Reaniciar agora?</string>
   <!-- Description for reboot confirmation in System Settings Developer options [CHAR LIMIT=150] -->
   <!-- Title for HDCP checking option in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for HDCP checking option in System Settings Developer options [CHAR LIMIT=50] -->
@@ -456,6 +488,7 @@
   <!-- Title for Set Animator duration scale in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set Strict mode enabled in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set Show CPU usage in System Settings Developer options [CHAR LIMIT=50] -->
+  <string name="system_show_cpu_usage">Amosar usu de CPU</string>
   <!-- Title for Set Profile GPU rendering in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set Enable traces in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Title for Set Don't keep activities in System Settings Developer options [CHAR LIMIT=100] -->
@@ -481,25 +514,27 @@
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is off [CHAR LIMIT=30] -->
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
+  <string name="agree">Aceuto</string>
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
+  <string name="disagree">Refugo</string>
   <!-- Security -->
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
+  <string name="security_unknown_sources_title">Fontes desconocíes</string>
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
+  <string name="security_unknown_sources_desc">Permite la instalación d\'aplicaciones dende otres fontes distintes a Google Play</string>
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
+  <string name="security_unknown_sources_confirm_desc">Los tos datos personales y el preséu son más vulnerables a los ataques d\'apliaciones de fontes desconocíes. Tas acordies de ser l\'únicu responsable de cualesquier dañu nel to preséu o perda de datos que quiciabes derive del usu d\'estes aplicaciones.</string>
   <!-- Title for action to warn before installing applications that may cause harm [CHAR LIMIT=50]-->
   <!-- Description for action to warn before installing of applications that may cause harm [CHAR LIMIT=NONE]-->
   <!-- Summary for HDCP checking preference. [CHAR LIMIT=100]-->
   <!-- Summary for HDCP checking preference. [CHAR LIMIT=100]-->
   <!-- Summary for HDCP checking preference. [CHAR LIMIT=100]-->
+  <string name="system_hdcp_checking_always">Siempres</string>
   <!-- Title for HDMI optimization preference value [CHAR LIMIT=60] -->
-  <string name="system_hdmi_optimization_best_resolution">La meyor resolución</string>
   <!-- Title for HDMI optimization preference value [CHAR LIMIT=60] -->
-  <string name="system_hdmi_optimization_best_framerate">Máxima velocidá de fotogrames</string>
   <!-- Title for debug overdraw preference. [CHAR LIMIT=35] -->
   <!-- Title for debug overdraw preference. [CHAR LIMIT=35] -->
-  <string name="system_hw_overdraw_areas">Amosar árees superpuestes</string>
   <!-- Title for debug overdraw preference. [CHAR LIMIT=35] -->
-  <string name="system_hw_overdraw_counter">Amosar contador de superposiciones</string>
   <!-- UI debug setting: label for app picker to select no application [CHAR LIMIT=50] -->
   <!-- Title for OpenGL traces preference. [CHAR LIMIT=35] -->
   <!-- Title for OpenGL traces preference. Do not translate "Logcat" [CHAR LIMIT=35] -->
@@ -512,10 +547,15 @@
   <!-- Title for frame time tracking preference. Do not translate "adb shell dumpsys gfxinfo" [CHAR LIMIT=35] -->
   <!-- Title for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Title for app process limit preference. [CHAR LIMIT=35] -->
+  <string name="app_process_limit_zero">Ensin procesos de fondu</string>
   <!-- Title for app process limit preference. [CHAR LIMIT=35] -->
+  <string name="app_process_limit_one">Como muncho 1 procesu</string>
   <!-- Title for app process limit preference. [CHAR LIMIT=35] -->
+  <string name="app_process_limit_two">Como muncho 2 procesos</string>
   <!-- Title for app process limit preference. [CHAR LIMIT=35] -->
+  <string name="app_process_limit_three">Como muncho 3 procesos</string>
   <!-- Title for app process limit preference. [CHAR LIMIT=35] -->
+  <string name="app_process_limit_four">Como muncho 4 procesos</string>
   <!--  Description for the preference screen to enable the global gesture that turns on accessibility. [CHAR LIMIT=none] -->
   <!-- Do not translate. -->
   <!-- TTS settings -->
@@ -526,8 +566,10 @@
   <!-- Text-to-speech speech rate choice [CHAR LIMIT=30] -->
   <!-- Keyboard Settings -->
   <!-- Title for Current Keyboard [CHAR LIMIT=80] -->
+  <string name="title_current_keyboard">Tecláu actual</string>
   <!-- Title for configure current keyboard [CHAR LIMIT=80] -->
   <!-- Description for configure current keyboard [CHAR LIMIT=100] -->
+  <string name="desc_configure_keyboard">Opciones de tecláu</string>
   <!-- String shown when computing the total size of an application's cache or data files. [CHAR LIMIT=30] -->
   <!-- Title for selecting wifi network [CHAR LIMIT=150] -->
   <!-- Action option which allows the change of the name this device is known by other wifi display devices [CHAR LIMIT=40] -->
@@ -537,8 +579,11 @@
   <!-- Title of intent resolver activity when selecting an application to run. [CHAR LIMIT=50]-->
   <!-- Quetsion about always using the selected application resolution in the future. See the "Complete action using" dialog title [CHAR LIMIT=50]-->
   <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title [CHAR LIMIT=50]-->
+  <string name="alwaysUseOption">Usar siempres</string>
   <!-- Option to only use the selected option this time. See the "Complete action using" dialog title [CHAR LIMIT=50]-->
+  <string name="justOnceOption">Namái una vegada</string>
   <!-- Text to display when there are no activities found to display in the activity chooser. See the whichApplication title.[CHAR LIMIT=50] -->
+  <string name="noApplications">Denguna aplicación pue facer esta aición.</string>
   <!-- Action to go back to the previous screen, when no apps have been found to perform the requested action. [CHAR LIMIT=50]-->
   <!-- TV input settings row -->
   <!-- Header of HDMI CEC device control [CHAR LIMIT=50] -->
@@ -546,7 +591,9 @@
   <!-- Name of predefined name for TV input (Blu-ray player) [CHAR LIMIT=30] -->
   <!-- Name of predefined name for TV input (Cable TV) [CHAR LIMIT=30] -->
   <!-- Name of predefined name for TV input (DVD player) [CHAR LIMIT=30] -->
+  <string name="inputs_dvd">DVD</string>
   <!-- Name of predefined name for TV input (Gaming device) [CHAR LIMIT=30] -->
+  <string name="inputs_game">Video-consola</string>
   <!-- Name of predefined name for TV input (Aux) [CHAR LIMIT=30] -->
   <!-- Title of using customized name for a TV input [CHAR LIMIT=30] -->
   <!-- Title of option to hide. It will describe current state of the inputs instead of the action [CHAR LIMIT=30] -->
@@ -567,16 +614,20 @@
   <!-- Summary for apps that aren't supported in limited users [CHAR LIMIT=none] -->
   <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
   <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <string name="restriction_location_enable_title">Allugamientu</string>
   <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
   <!-- Action to switch to a restricted profile [CHAR LIMIT=100] -->
   <!-- Action to switch out of a restricted profile [CHAR LIMIT=100] -->
   <!-- Title for action to delete a restricted profile [CHAR LIMIT=100] -->
   <!-- Title for action to configure a restricted profile [CHAR LIMIT=100] -->
+  <string name="restricted_profile_configure_title">Axustes</string>
   <!-- Title for action to configure apps for a restricted profile [CHAR LIMIT=100] -->
+  <string name="restricted_profile_configure_apps_title">Aplicaciones permitíes</string>
   <!-- Description for action to configure apps for a restricted profile indicating number of allow apps will be ready in a moment [CHAR LIMIT=100] -->
   <!-- An action label indicating the package will be or is allowed [CHAR LIMIT=100] -->
   <!-- An action label indicating the package will be or is not allowed [CHAR LIMIT=100] -->
   <!-- Action to customize restrictions for a package [CHAR LIMIT=100] -->
+  <string name="restricted_profile_customize_restrictions">Torgues personalizaes</string>
   <!-- Description for action to configure apps for a restricted profile indicating the number of allow apps [CHAR LIMIT=100] -->
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
@@ -592,131 +643,69 @@
   <!-- Title of PIN dialog when an user is asked to set a PIN. [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is about to change older PIN. [CHAR LIMIT=50] -->
   <!-- Message shown in the dialog when the user entered the wrong. [CHAR LIMIT=128] -->
-  <string name="pin_enter_wrong_seconds">Teclexasti un PIN incorreutu 5 vegaes.\nVuelvi intentalo en <xliff:g id="relative_time_span" example="60">%1$d</xliff:g> segundos.</string>
   <!-- Toast message when an user entered wrong PIN. [CHAR LIMIT=128] -->
   <!-- Toast message when an user couldn't pass the PIN confirmation. [CHAR LIMIT=128] -->
   <!-- Message displayed to prompt the user to input the network password, ^1 will be replaced with the name of the network and should be a possive form related to password [CHAR LIMIT=NONE] -->
-  <string name="wifi_setup_input_password">Introduz la contraseña de <xliff:g id="ssid">%1$s</xliff:g>.</string>
   <!-- Message displayed when the selected Wi-Fi network has been connected to [CHAR LIMIT=40] -->
-  <string name="wifi_setup_connection_success">Coneutada correutamente</string>
   <!-- Message displayed when the Wi-Fi network's configuration has been saved [CHAR LIMIT=40] -->
-  <string name="wifi_setup_save_success">Guardada correutamente.</string>
   <!-- Application management application version label [CHAR LIMIT=NONE] -->
-  <string name="device_apps_app_management_version">verisión <xliff:g id="app_version">%1$s</xliff:g></string>
   <!-- Application management description for opening the application [CHAR LIMIT=NONE] -->
-  <string name="device_apps_app_management_open">Abrir</string>
   <!-- Application management choice for force stopping the application [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_force_stop">Forciar parada</string>
   <!-- Application management description for force stopping the application [CHAR LIMIT=NONE] -->
-  <string name="device_apps_app_management_force_stop_desc">Si forcies la parada d\'una aplicación, quiciabes nun furrule bien.</string>
   <!-- Application management choice for uninstalling the application [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_uninstall">Desinstalar</string>
   <!-- Application management description for uninstalling the application [CHAR LIMIT=NONE] -->
-  <string name="device_apps_app_management_uninstall_desc">¿Quies desinstalar esta aplicación?</string>
   <!-- Application management choice for uninstalling updates for the application [CHAR_LIMIT=40] -->
-  <string name="device_apps_app_management_uninstall_updates">Desinstalar anovamientos</string>
   <!-- Application management description for uninstalling updates for the application [CHAR_LIMIT=NONE] -->
-  <string name="device_apps_app_management_uninstall_updates_desc">Van desinstalase tolos anovamientos d\'esta aplicación del sistema Android.</string>
   <!-- Application management choice for disabling the application [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_disable">Deshabilitar</string>
   <!-- Application management description for disabling the application [CHAR LIMIT=NONE] -->
-  <string name="device_apps_app_management_disable_desc">¿Quies desinstalar esta aplicación?</string>
   <!-- Application management choice for enabling the application [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_enable">Habilitar</string>
   <!-- Application management description for enabling the application [CHAR LIMIT=NONE] -->
-  <string name="device_apps_app_management_enable_desc">¿Quies habilitar esta aplicación?</string>
   <!-- Application management choice for displaying the application's size [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_storage_used">Almacenamientu usáu</string>
   <!-- Application management description for displaying the applicantion's size [CHAR_LIMIT=NONE] -->
-  <string name="device_apps_app_management_storage_used_desc"><xliff:g id="size" example="30.2MB">%1$s</xliff:g> usaos en <xliff:g id="volume" example="internal storage">%2$s</xliff:g></string>
   <!-- Application management choice for clearing the application's data [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_clear_data">Llimpiar datos</string>
   <!-- Application management description for clearing the application's data [CHAR LIMIT=NONE] -->
-  <string name="device_apps_app_management_clear_data_desc">Van desaniciase dafechu tolos datos d\'esta aplicación.\nEsto inclúi tolos ficheros, axustes, cuentes, bases de datos... etc.</string>
   <!-- Application management choice for clearing the application's default actions [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_clear_default">Llimpiar predeterminaes</string>
   <!-- Application management description for defaults are set for the application [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_clear_default_set">Configurar p\'abrir según aiciones</string>
   <!-- Application management description for defaults aren't set for the application [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_clear_default_none">Nun hai configuraciones predeterminaes</string>
   <!-- Application management choice for clearing the application's cache [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_clear_cache">Llimpiar caché</string>
   <!-- Application management choice for changing the application's notifications option [CHAR LIMIT=40] -->
   <string name="device_apps_app_management_notifications">Avisos</string>
   <!-- Application management choice for displaying the application's permissions [CHAR LIMIT=40] -->
-  <string name="device_apps_app_management_permissions">Permisos</string>
   <!-- General settings choice for agreeing to the displayed action [CHAR LIMIT=40] -->
+  <string name="settings_ok">ACEUTAR</string>
   <!-- General settings choice for disagreeing with the displayed action [CHAR LIMIT=40] -->
+  <string name="settings_cancel">Encaboxar</string>
   <!-- General settings choice for on [CHAR LIMIT=40] -->
   <!-- General settings choice for off [CHAR LIMIT=40] -->
   <!-- Daydream choice for not having a daydream [CHAR LIMIT=40] -->
   <!-- Daydream choice for selecting a different daydream [CHAR LIMIT=40] -->
   <!-- Daydream choice for testing the selected daydream [CHAR LIMIT=40] -->
-  <string name="device_daydreams_test">Aniciar agora</string>
   <!-- Daydream choice for configuring the time before the device goes to sleep [CHAR LIMIT=40] -->
-  <string name="device_daydreams_sleep">Cuándo activar prot. de pantalla int.</string>
   <!-- Daydream description for configuring the time before the device goes to sleep [CHAR LIMIT=NONE] -->
-  <string name="device_daydreams_sleep_description">El proteutor de pantalla interactivu va apaecer una vegada trescurríu esti periodu d\'inactividá. Si nun esbilles un proteutor de pantalla interactivu, va apagase la pantalla.</string>
   <!-- Daydream summary for displaying the time before the device goes to sleep -->
-  <string name="device_daydreams_sleep_summary">Dempués de <xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> d\'inactividá</string>
   <!-- Daydream choice for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=40] -->
-  <string name="device_daydreams_screen_off">Al dormir</string>
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
-  <string name="device_daydreams_screen_off_description">La pantalla apágase dempués d\'esti periodu d\'inactividá.</string>
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
-  <string name="backup_configure_account_default_summary">Nesti momentu, nenguna cuenta almacena copies de seguranza de los datos.</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_message">¿Quies dexar de guardar copies de seguranza de contraseñes Wi-Fi, marcadores, configuraciones, datos d\'apps y desaniciar toles copies de los sirvidores de Google?</string>
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
-  <string name="privacy_backup_data">Crear copia de seguranza de los mios datos</string>
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
-  <string name="privacy_backup_account">Cuenta de copia de seguranza</string>
   <!-- Privacy choice for configuring automatic restore [CHAR LIMIT=40] -->
-  <string name="privacy_automatic_restore">Restauración automática</string>
   <!-- Factory reset choice for initiating a factory reset [CHAR LIMIT=40] -->
-  <string name="factory_reset_device">Reafitar preséu</string>
   <!-- Factory reset description about what happens when you perform a factory reset [CHAR LIMIT=NONE] -->
-  <string name="factory_reset_description">Van desaniciase toos datos del almacenamientu internu del to preséu, incluyendo datos y parámetros d\'axustes d\'apps y del sistema, les apps que descargasti y la to cuenta de Google.</string>
   <!-- Factory reset screen, message on screen after user selects Reset phone button -->
-  <string name="confirm_factory_reset_description">¿Quies desaniciar la to info personal y les apps que descargasti? Esta aición nun pue desfacese.</string>
   <!-- Factory reset screen, button on screen after user selects Reset phone button -->
-  <string name="confirm_factory_reset_device">Desanicialo too</string>
   <!-- Title for screen where user selects a name for their device [CHAR LIMIT=NONE] -->
-  <string name="select_title">Esbilla un nome pal to ^1</string>
   <!-- Description for screen where user selects a name for their device [CHAR LIMIT=NONE] -->
-  <string name="select_description">Un nome ayuda a identificar el to ^1 cuando accedas a él dende otros preseos, como\'l teléfonu, la tablet o la computadora.</string>
   <!-- Rooms where a user's device might be placed [CHAR LIMIT=40] -->
-  <string-array name="rooms">
-    <!-- [CHAR LIMIT=40] -->
-    <item>Salón</item>
-    <!-- [CHAR LIMIT=40] -->
-    <item>Sala multimedia</item>
-    <!-- [CHAR LIMIT=40] -->
-    <item>Sala familiar</item>
-    <!-- [CHAR LIMIT=40] -->
-    <item>Comedor</item>
-    <!-- [CHAR LIMIT=40] -->
-    <item>Estudiu</item>
-    <!-- [CHAR LIMIT=40] -->
-    <item>Dormitoriu</item>
-    <!-- [CHAR LIMIT=40] -->
-    <item>Cocina</item>
-  </string-array>
   <!-- String displayed for option where user will type in a room name rather than selecting from the list of defaults [CHAR LIMIT=40] -->
-  <string name="custom_room">Introducir nome personalizáu&#8230;</string>
   <!-- Title of settings summary/status screen [CHAR LIMIT=100] -->
-  <string name="settings_status_title">Esti ^1 yá tien nome</string>
   <!-- Description on summary/status screen that tells you what the name of your device is [CHAR LIMIT=NONE] -->
-  <string name="settings_status_description">\"^1\" ye\'l nome d\'esti ^2. ¿Quies modificalu?</string>
   <!-- The 'yes' or 'edit' equivalent in a yes/no choice circumstance [CHAR LIMIT=30] -->
   <!-- The 'no' or  'keep the same' equivalent in a yes/no choice circumstance [CHAR LIMIT=30]-->
   <!-- Group header for app permissions [CHAR LIMIT=20] -->
-  <string name="apps_permissions">Permisos</string>
   <!-- Item title for app permissions [CHAR LIMIT=20] -->
-  <string name="device_apps_permissions">Permisos d\'apps.</string>
   <!-- Summary of number of apps currently granted a single permission [CHAR LIMIT=45] -->
-  <string name="app_permissions_group_summary"><xliff:g id="count" example="10">%d</xliff:g> de <xliff:g id="count" example="10">%d</xliff:g> apps permitíes</string>
   <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
   <string name="security_patch">Nivel de parche de seguranza d\'Android</string>
 </resources>
diff --git a/Settings/res/values-ca/cm_strings.xml b/Settings/res/values-ca/cm_strings.xml
index 70e397c1..1d71d844 100644
--- a/Settings/res/values-ca/cm_strings.xml
+++ b/Settings/res/values-ca/cm_strings.xml
@@ -30,7 +30,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already_cm">No fa falta, ja has habilitat les configuracions de desenvolupament.</string>
   <!-- About screen, build date -->
-  <string name="about_build_date">Data d\'elaboració</string>
+  <string name="about_build_date">Data de compilació</string>
   <!-- About screen, kernel version -->
   <string name="about_kernel_version">Versió del Kernel</string>
   <!-- About screen, SELinux status -->
@@ -76,7 +76,7 @@
   <string name="reboot_soft_button_label">Reinici ràpid</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ADB sobre la xarxa</string>
-  <string name="adb_over_network_summary">Activa la depuració TCP/IP sobre interfícies de xarxa (Wi\u2011Fi, xarxes USB). Aquest ajustament es desactiva en reiniciar</string>
+  <string name="adb_over_network_summary">Activa la depuració TCP/IP sobre interfícies de xarxa (Wi\u2011Fi, xarxes USB). Aquesta configuració es desactivarà en reiniciar</string>
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">ADVERTÈNCIA: Quan l\'ADB sobre xarxa està activat, la teva TV està oberta a intrusions en totes les xarxes connectades! \n\nFes servir aquesta característica només quan estiguis connectat en xarxes de confiança.\n\nRealment vols activar aquesta funció?</string>
 </resources>
diff --git a/Settings/res/values-en-rAU/cm_strings.xml b/Settings/res/values-en-rAU/cm_strings.xml
index 6128f499..f75542d6 100644
--- a/Settings/res/values-en-rAU/cm_strings.xml
+++ b/Settings/res/values-en-rAU/cm_strings.xml
@@ -17,26 +17,66 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- CM Updater -->
+  <string name="about_cmupdate_settings_title">CyanogenMod updates</string>
   <!-- About screen, CyanogenMod version -->
+  <string name="about_mod_version">CyanogenMod version</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from enabling development settings.</item>
+    <item quantity="other">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from enabling development settings.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">You have enabled development settings!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">No need, you have already enabled development settings.</string>
   <!-- About screen, build date -->
+  <string name="about_build_date">Build date</string>
   <!-- About screen, kernel version -->
+  <string name="about_kernel_version">Kernel version</string>
   <!-- About screen, SELinux status -->
+  <string name="about_selinux_status">SELinux status</string>
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
+  <string name="selinux_status_disabled">Disabled</string>
+  <string name="selinux_status_permissive">Permissive</string>
+  <string name="selinux_status_enforcing">Enforcing</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
+  <string name="accessories_add_bluetooth_inst_cm">To start using CyanogenMod make sure your Bluetooth device is in pairing mode. For Nexus Remote this is done by pressing back and home simultaneously.</string>
   <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Setting title for root access -->
+  <string name="root_access">Root access</string>
+  <string name="root_access_warning_title">Allow root access?</string>
+  <string name="root_access_warning_message">Allowing apps to request root access is very dangerous and could compromise the security of your system!</string>
+  <string name="root_access_none">Disabled</string>
+  <string name="root_access_apps">Apps only</string>
+  <string name="root_access_adb">ADB only</string>
+  <string name="root_access_all">Apps and ADB</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <string name="enable_terminal_title">Local terminal</string>
+  <string name="enable_terminal_summary">Enable terminal app that offers local shell access</string>
   <!-- Display settings -->
+  <string name="system_display">Display</string>
+  <string name="system_display_overscan">Overscan</string>
+  <string name="system_display_overscan_description">Calibrate the display to fit your screen size.</string>
   <!-- Home settings -->
+  <string name="system_reset_default_home">Reset default home screen</string>
+  <string name="system_home_settings">Home settings</string>
+  <string name="reset_launcher_title">Reset default home screen</string>
+  <string name="reset_launcher_description">By resetting the default home screen, you will be able to choose an alternate home screen (i.e Trebuchet).\n\nWould you like to reset the default home screen?</string>
+  <string name="reset_launcher_tip">Press the home button to bring up the home screen selection dialog.</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">Advanced reboot</string>
+  <string name="advanced_reboot_summary">Include options in the about menu for rebooting into recovery, bootloader or performing a soft reboot</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery_button_label">Recovery</string>
   <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader_button_label">Bootloader</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft_button_label">Soft reboot</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB over network</string>
+  <string name="adb_over_network_summary">Enable TCP/IP debugging over network interfaces (Wi\u2011Fi, USB networks). This setting is reset on reboot</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">WARNING: When ADB over network is enabled, your TV is open for intrusions on all connected networks!\n\nOnly use this feature when you are connected on trusted networks.\n\nDo you really want to enable this function?</string>
 </resources>
diff --git a/Settings/res/values-en-rGB/cm_strings.xml b/Settings/res/values-en-rGB/cm_strings.xml
index 6128f499..f75542d6 100644
--- a/Settings/res/values-en-rGB/cm_strings.xml
+++ b/Settings/res/values-en-rGB/cm_strings.xml
@@ -17,26 +17,66 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- CM Updater -->
+  <string name="about_cmupdate_settings_title">CyanogenMod updates</string>
   <!-- About screen, CyanogenMod version -->
+  <string name="about_mod_version">CyanogenMod version</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from enabling development settings.</item>
+    <item quantity="other">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from enabling development settings.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">You have enabled development settings!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">No need, you have already enabled development settings.</string>
   <!-- About screen, build date -->
+  <string name="about_build_date">Build date</string>
   <!-- About screen, kernel version -->
+  <string name="about_kernel_version">Kernel version</string>
   <!-- About screen, SELinux status -->
+  <string name="about_selinux_status">SELinux status</string>
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
+  <string name="selinux_status_disabled">Disabled</string>
+  <string name="selinux_status_permissive">Permissive</string>
+  <string name="selinux_status_enforcing">Enforcing</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
+  <string name="accessories_add_bluetooth_inst_cm">To start using CyanogenMod make sure your Bluetooth device is in pairing mode. For Nexus Remote this is done by pressing back and home simultaneously.</string>
   <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Setting title for root access -->
+  <string name="root_access">Root access</string>
+  <string name="root_access_warning_title">Allow root access?</string>
+  <string name="root_access_warning_message">Allowing apps to request root access is very dangerous and could compromise the security of your system!</string>
+  <string name="root_access_none">Disabled</string>
+  <string name="root_access_apps">Apps only</string>
+  <string name="root_access_adb">ADB only</string>
+  <string name="root_access_all">Apps and ADB</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <string name="enable_terminal_title">Local terminal</string>
+  <string name="enable_terminal_summary">Enable terminal app that offers local shell access</string>
   <!-- Display settings -->
+  <string name="system_display">Display</string>
+  <string name="system_display_overscan">Overscan</string>
+  <string name="system_display_overscan_description">Calibrate the display to fit your screen size.</string>
   <!-- Home settings -->
+  <string name="system_reset_default_home">Reset default home screen</string>
+  <string name="system_home_settings">Home settings</string>
+  <string name="reset_launcher_title">Reset default home screen</string>
+  <string name="reset_launcher_description">By resetting the default home screen, you will be able to choose an alternate home screen (i.e Trebuchet).\n\nWould you like to reset the default home screen?</string>
+  <string name="reset_launcher_tip">Press the home button to bring up the home screen selection dialog.</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">Advanced reboot</string>
+  <string name="advanced_reboot_summary">Include options in the about menu for rebooting into recovery, bootloader or performing a soft reboot</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery_button_label">Recovery</string>
   <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader_button_label">Bootloader</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft_button_label">Soft reboot</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB over network</string>
+  <string name="adb_over_network_summary">Enable TCP/IP debugging over network interfaces (Wi\u2011Fi, USB networks). This setting is reset on reboot</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">WARNING: When ADB over network is enabled, your TV is open for intrusions on all connected networks!\n\nOnly use this feature when you are connected on trusted networks.\n\nDo you really want to enable this function?</string>
 </resources>
diff --git a/Settings/res/values-es-rUS/cm_strings.xml b/Settings/res/values-es-rUS/cm_strings.xml
index 8904420d..74d954c1 100644
--- a/Settings/res/values-es-rUS/cm_strings.xml
+++ b/Settings/res/values-es-rUS/cm_strings.xml
@@ -41,12 +41,12 @@
   <string name="selinux_status_permissive">Permisivo</string>
   <string name="selinux_status_enforcing">Forzado</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
-  <string name="accessories_add_bluetooth_inst_cm">Para empezar a utilizar CyanogenMod asegúrate de que el dispositivo Bluetooth esté en modo emparejamiento. Para Nexus Remote esto se logra al pulsar Inicio y Volver al mismo tiempo.</string>
+  <string name="accessories_add_bluetooth_inst_cm">Para empezar a utilizar CyanogenMod asegúrate de que el dispositivo Bluetooth esté en modo emparejamiento. Para Nexus Remote esto se logra al pulsar Atrás e Inicio al mismo tiempo.</string>
   <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Setting title for root access -->
-  <string name="root_access">Acceso root</string>
-  <string name="root_access_warning_title">¿Permitir acceso root?</string>
-  <string name="root_access_warning_message">¡Permitir que las aplicaciones tengan acceso root es muy peligroso y puede comprometer la seguridad del dispositivo!</string>
+  <string name="root_access">Acceso administrativo</string>
+  <string name="root_access_warning_title">¿Permitir acceso administrativo?</string>
+  <string name="root_access_warning_message">¡Permitir a las aplicaciones solicitar acceso administrativo es muy peligroso y puede comprometer la seguridad del sistema!</string>
   <string name="root_access_none">Desactivado</string>
   <string name="root_access_apps">Solo aplicaciones</string>
   <string name="root_access_adb">Solo ADB</string>
@@ -57,15 +57,15 @@
   <!-- Display settings -->
   <string name="system_display">Pantalla</string>
   <string name="system_display_overscan">Sobrebarrido</string>
-  <string name="system_display_overscan_description">Calibrar la pantalla para ajustar al tamaño de la pantalla.</string>
+  <string name="system_display_overscan_description">Calibra la pantalla para ajustar al tamaño de la pantalla.</string>
   <!-- Home settings -->
-  <string name="system_reset_default_home">Restablecer la pantalla de inicio predeterminada</string>
+  <string name="system_reset_default_home">Restablecer la pantalla de inicio predefinida</string>
   <string name="system_home_settings">Ajustes de la pantalla de inicio</string>
-  <string name="reset_launcher_title">Restablecer la pantalla de inicio predeterminada</string>
-  <string name="reset_launcher_description">Al restablecer la pantalla de inicio podrás elegir una pantalla de inicio alternativa (Ej. Trebuchet).\n\n¿Deseas restablecer la pantalla de inicio predeterminada?</string>
+  <string name="reset_launcher_title">Restablecer la pantalla de inicio predefinida</string>
+  <string name="reset_launcher_description">Al restablecer la pantalla de inicio podrás elegir una pantalla de inicio alternativa (Ej. Trebuchet).\n\n¿Deseas restablecer la pantalla de inicio predefinida?</string>
   <string name="reset_launcher_tip">Pulsa el botón de inicio para que aparezca el cuadro de diálogo de selección de pantalla de inicio.</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">Opciones avanzadas para reiniciar</string>
+  <string name="advanced_reboot_title">Reinicio avanzado</string>
   <string name="advanced_reboot_summary">Incluir opciones en el menú para reiniciar en modo recuperación, bootloader o realizar un reinicio rápido</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
@@ -76,7 +76,7 @@
   <string name="reboot_soft_button_label">Reinicio rápido</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ADB sobre red</string>
-  <string name="adb_over_network_summary">Activar la depuración TCP/IP sobre las interfaces de red (Wi\u2011Fi, redes USB). Este ajuste se restablecen al reiniciar el dispositivo</string>
+  <string name="adb_over_network_summary">Activar la depuración TCP/IP sobre las interfaces de red (Wi\u2011Fi, redes USB). Este ajuste se restablece al reiniciar el dispositivo</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">ADVERTENCIA: Cuando ADB sobre red está activado, el dispositivo podrá recibir intrusiones en todas las redes conectadas.\n\nUtiliza esta función solamente cuando estés conectado a redes de confianza.\n\n¿Realmente deseas activar esta función?</string>
+  <string name="adb_over_network_warning">ADVERTENCIA: Cuando ADB sobre red está activado, el dispositivo podrá recibir intrusiones en todas las redes conectadas.\n\nUtiliza esta función solamente estando conectado a redes de confianza.\n\n¿Realmente deseas activar esta función?</string>
 </resources>
diff --git a/Settings/res/values-ja/cm_strings.xml b/Settings/res/values-ja/cm_strings.xml
index 849a023a..0c2a370d 100644
--- a/Settings/res/values-ja/cm_strings.xml
+++ b/Settings/res/values-ja/cm_strings.xml
@@ -40,7 +40,7 @@
   <string name="selinux_status_permissive">Permissive</string>
   <string name="selinux_status_enforcing">Enforcing</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
-  <string name="accessories_add_bluetooth_inst_cm">LineageOS の使用を開始するには、お使いのBluetoothデバイスがペアリングモードになっていることを確認して下さい。Nexus Playerのリモコンでは、戻るボタンとホームボタンを同時に押すとペアリングモードになります。</string>
+  <string name="accessories_add_bluetooth_inst_cm">LineageOS の使用を開始するには、お使いの Bluetooth デバイスがペアリングモードになっていることを確認して下さい。Nexus Player のリモコンでは、戻るボタンとホームボタンを同時に押すとペアリングモードになります。</string>
   <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Setting title for root access -->
   <string name="root_access">ルートアクセス</string>
@@ -77,5 +77,5 @@
   <string name="adb_over_network">ネットワーク経由のADB</string>
   <string name="adb_over_network_summary">ネットワークインターフェース（Wi\u2011Fi、USBネットワーク）経由でのTCP/IPデバッグを有効にします。この設定は再起動時にリセットされます。</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">警告: ネットワーク経由のADBが有効になっているとき、携帯電話は接続しているすべてのネットワーク上で侵入に対して無防備になります。\n\n信頼できるネットワーク接続しているときにのみ、この機能を使用してください。\n\nこの機能を本当に有効にしますか？</string>
+  <string name="adb_over_network_warning">警告: ネットワーク経由のADBが有効になっているとき、端末は接続しているすべてのネットワーク上で侵入に対して無防備になります。\n\n信頼できるネットワーク接続しているときにのみ、この機能を使用してください。\n\nこの機能を本当に有効にしますか？</string>
 </resources>
diff --git a/Settings/res/values-ko/cm_strings.xml b/Settings/res/values-ko/cm_strings.xml
index 47f2037c..a22f208f 100644
--- a/Settings/res/values-ko/cm_strings.xml
+++ b/Settings/res/values-ko/cm_strings.xml
@@ -22,7 +22,7 @@
   <string name="about_mod_version">CyanogenMod 버전</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
-    <item quantity="other">개발자 설정을 활성화하려면 <xliff:g id="step_count">%1$d</xliff:g>회 더 누르십시오.</item>
+    <item quantity="other">개발자 설정을 활성화하려면 <xliff:g id="step_count">%1$d</xliff:g>회 더 누르세요.</item>
   </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">개발자 설정이 활성화되었습니다!</string>
diff --git a/Settings/res/values-ro/cm_strings.xml b/Settings/res/values-ro/cm_strings.xml
index e4de23d8..8ad1ed3f 100644
--- a/Settings/res/values-ro/cm_strings.xml
+++ b/Settings/res/values-ro/cm_strings.xml
@@ -33,7 +33,7 @@
   <!-- About screen, build date -->
   <string name="about_build_date">Dată compilare</string>
   <!-- About screen, kernel version -->
-  <string name="about_kernel_version">Versiune nucleu</string>
+  <string name="about_kernel_version">Versiune kernel</string>
   <!-- About screen, SELinux status -->
   <string name="about_selinux_status">Starea SELinux</string>
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
diff --git a/Settings/res/values-sq-rAL/cm_strings.xml b/Settings/res/values-sq-rAL/cm_strings.xml
index 6128f499..844c6ece 100644
--- a/Settings/res/values-sq-rAL/cm_strings.xml
+++ b/Settings/res/values-sq-rAL/cm_strings.xml
@@ -17,26 +17,51 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- CM Updater -->
+  <string name="about_cmupdate_settings_title">Përditësime të CyanogenMod</string>
   <!-- About screen, CyanogenMod version -->
+  <string name="about_mod_version">Versioni i CyanogenMod</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">Ju jeni edhe <xliff:g id="step_count">%1$d</xliff:g> hap larg aktivizimit të parametrave të zhvillimit.</item>
+    <item quantity="other">Ju jeni edhe <xliff:g id="step_count">%1$d</xliff:g> hap larg aktivizimit të parametrave të zhvillimit.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">Ju keni aktivizuar parametrat e zhvillimit!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">Nuk ka më nevojë të shtypni! Parametrat e zhvillimit janë të aktivizuara.</string>
   <!-- About screen, build date -->
+  <string name="about_build_date">Data e ndërtimit</string>
   <!-- About screen, kernel version -->
+  <string name="about_kernel_version">Versioni i kernelit</string>
   <!-- About screen, SELinux status -->
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
+  <string name="accessories_add_bluetooth_inst_cm">Për të përdorur CyanogenMod, sigurohu që pajisja juaj Bluetooth të jetë në profilin e çiftëzimit. Për Nexus Remote, kjo mund të kryhet duke shtypur njëkohësisht butonat Prapa dhe Home.</string>
   <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Setting title for root access -->
+  <string name="root_access">Aksesi Root</string>
+  <string name="root_access_warning_title">Dëshiron të lejosh aksesin Root?</string>
+  <string name="root_access_none">I çaktivizuar</string>
+  <string name="root_access_apps">Vetëm aplikacionet</string>
+  <string name="root_access_adb">Vetëm ADB</string>
+  <string name="root_access_all">Aplikacionet dhe ADB</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
   <!-- Display settings -->
   <!-- Home settings -->
+  <string name="system_home_settings">Parametrat e Home</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">Rindezjet e përparuara</string>
+  <string name="advanced_reboot_summary">Përfshi në menu opsionet për t\'u rindezur në Recovery, Bootloader, ose për rindezje të shpejtë</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery_button_label">Recovery</string>
   <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader_button_label">Bootloader</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft_button_label">Rindezje e shpejtë</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB mbi rrjet</string>
+  <string name="adb_over_network_summary">Aktivizo debugimin TCP/IP mbi ndërfaqet e rrjetit (Wi\u2011Fi, rrjetet USB). Ky parametër do të çaktivizohet gjatë rindezjes</string>
   <!-- Warning for Adb over Network -->
 </resources>