Automatic translation import

Change-Id: Ib99208369c57fd8b032899582060f1a55ece7789

19 files changed, 1462 insertions, 79 deletions

diff --git a/Settings/res/values-bs-rBA/cm_strings.xml b/Settings/res/values-bs-rBA/cm_strings.xml
new file mode 100644
index 00000000..eddd58d1
--- /dev/null
+++ b/Settings/res/values-bs-rBA/cm_strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- CM Updater -->
+  <!-- About screen, CyanogenMod version -->
+  <!-- About screen, status item label  [CHAR LIMIT=60] -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] 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 -->
+  <!-- About screen, build date -->
+  <!-- About screen, kernel version -->
+  <!-- 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] -->
+  <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Setting title for root access -->
+  <!-- Setting for updating Cyanogen recovery -->
+  <!-- Android debugging over WiFi -->
+  <!-- Warning for Adb over Network -->
+  <!-- Home settings -->
+  <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Advanced reboot options -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the device, within the Reboot Options dialog -->
+  <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Display settings -->
+</resources>
diff --git a/Settings/res/values-ca/cm_strings.xml b/Settings/res/values-ca/cm_strings.xml
index 71fc3789..606f3a73 100644
--- a/Settings/res/values-ca/cm_strings.xml
+++ b/Settings/res/values-ca/cm_strings.xml
@@ -66,10 +66,10 @@
   <!-- 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>
   <!-- Home settings -->
-  <string name="system_reset_default_home">Restaura la pantalla d\'inici per defecte</string>
+  <string name="system_reset_default_home">Restableix la pantalla d\'inici per defecte</string>
   <string name="system_home_settings">Configuració de l\'Inici</string>
-  <string name="reset_launcher_title">Restaura la pantalla d\'inici per defecte</string>
-  <string name="reset_launcher_description">Restaurant la pantalla d\'inici per defecte, podràs triar una pantalla d\'inici alternativa (p.e. Trebuchet).\n\nVols restaurar la pantalla d\'inici per defecte?</string>
+  <string name="reset_launcher_title">Restableix la pantalla d\'inici per defecte</string>
+  <string name="reset_launcher_description">Restablint la pantalla d\'inici per defecte, podràs triar una pantalla d\'inici alternativa (p.e. Trebuchet).\n\nVols restablir la pantalla d\'inici per defecte?</string>
   <string name="reset_launcher_tip">Prem el botó d\'inici per mostrar el diàleg de selecció de pantalla d\'inici.</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
   <string name="enable_terminal_title">Terminal local</string>
diff --git a/Settings/res/values-eo/arrays.xml b/Settings/res/values-eo/arrays.xml
index 4455ad7b..8871b3a9 100644
--- a/Settings/res/values-eo/arrays.xml
+++ b/Settings/res/values-eo/arrays.xml
@@ -18,11 +18,52 @@
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <string-array name="wifi_status">
+    <!-- Status message of Wi-Fi when it is idle. -->
+    <item/>
+    <!-- Status message of Wi-Fi when it is scanning. -->
+    <item>Scanning\u2026</item>
+    <!-- Status message of Wi-Fi when it is connecting. -->
+    <item>Connecting\u2026</item>
+    <!-- Status message of Wi-Fi when it is authenticating. -->
+    <item>Authenticating\u2026</item>
+    <!-- Status message of Wi-Fi when it is obtaining IP address. -->
+    <item>Obtaining IP address\u2026</item>
+    <!-- Status message of Wi-Fi when it is connected. -->
+    <item>Konektita</item>
+    <!-- Status message of Wi-Fi when it is suspended. -->
+    <item>Suspended</item>
+    <!-- Status message of Wi-Fi when it is disconnecting. -->
+    <item>Disconnecting\u2026</item>
+    <!-- Status message of Wi-Fi when it is disconnected. -->
+    <item>Malkonektita</item>
+    <!-- Status message of Wi-Fi when it is a failure. -->
+    <item>Unsuccessful</item>
+    <!-- Status message of Wi-Fi when it is blocked. -->
+    <item>Blocked</item>
+    <!-- Status message of Wi-Fi when connectiong is being verified. -->
+    <item>Temporarily avoiding poor connection</item>
+  </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Display settings.  The delay in inactivity before the daydream starts. -->
+  <string-array name="sleep_timeout_entries">
+    <item>5 minutoj</item>
+    <item>10 minutoj</item>
+    <item>15 minutoj</item>
+    <item>30 minutoj</item>
+    <item>1 hour</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 minutoj</item>
+    <item>1 horo</item>
+    <item>3 horoj</item>
+    <item>6 horoj</item>
+    <item>12 horoj</item>
+    <item>Neniam</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Titles for debug overdraw preference. [CHAR LIMIT=35] -->
   <!-- Values for debug overdraw preference. -->
diff --git a/Settings/res/values-eo/cm_strings.xml b/Settings/res/values-eo/cm_strings.xml
index 764f8175..eddd58d1 100644
--- a/Settings/res/values-eo/cm_strings.xml
+++ b/Settings/res/values-eo/cm_strings.xml
@@ -17,79 +17,29 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- CM Updater -->
-  <string name="about_cmupdate_settings_title">Ĝisdatigoj de CyanogenMod</string>
   <!-- About screen, CyanogenMod version -->
-  <string name="about_mod_version">Versio de CyanogenMod</string>
   <!-- About screen, status item label  [CHAR LIMIT=60] -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
-  <plurals name="show_dev_countdown_cm">
-    <item quantity="one">Vi estas nun <xliff:g id="step_count">%1$d</xliff:g> paŝon antaŭ la aktivado de programadaj argordoj.</item>
-    <item quantity="other">Vi estas nun <xliff:g id="step_count">%1$d</xliff:g> paŝojn antaŭ la aktivado de programadaj argordoj.</item>
-  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
-  <string name="show_dev_on_cm">Vi ŝaltis la programadajn agordojn!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-  <string name="show_dev_already_cm">Ne utilas, vi jam ŝaltis la programadajn agordojn.</string>
   <!-- About screen, build date -->
-  <string name="about_build_date">Konstrua dato</string>
   <!-- About screen, kernel version -->
-  <string name="about_kernel_version">Kerna versio</string>
   <!-- About screen, SELinux status -->
-  <string name="about_selinux_status">SELinux stato</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">Malŝaltita</string>
-  <string name="selinux_status_permissive">Rajtiga</string>
-  <string name="selinux_status_enforcing">Efikiga</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
-  <string name="accessories_add_bluetooth_inst_cm">Por komenci uzi CyanogenMod, certiĝu ke via Bludenta aparato estas en pariga reĝimo. Por Nexus Remote, Premu Reen kaj Hejmo butonojn samtempe.</string>
   <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Setting title for root access -->
-  <string name="root_access">Radikuzanta reĝimo</string>
-  <string name="root_access_warning_title">Ĉu permesi radikuzantajn permesojn?</string>
-  <string name="root_access_warning_message">Permesi al la aplikaĵoj peti radikuzantan aliron estas tre danĝere kaj povus kompromiti la sekurecon de via sistemo!</string>
-  <string name="root_access_none">Malŝaltita</string>
-  <string name="root_access_apps">Nur aplikaĵoj</string>
-  <string name="root_access_adb">Nur ADB</string>
-  <string name="root_access_all">Aplikaĵoj kaj ADB</string>
   <!-- Setting for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Cyanogen riparado</string>
-  <string name="update_recovery_on_summary">Ĝisdatigi per sistemaj ĝisdatigoj</string>
-  <string name="update_recovery_off_summary">Ne ĝisdatigi per sistemaj ĝisdatigoj</string>
-  <string name="update_recovery_on_warning">RIMARKO: Kiam tiu funkcio estas ŝaltita, via riparado estos anstataŭigita per tiu de via aktuala mastruma sistemo.\n\nVia riparado estos ĝisdatigita samtempe kiel via mastruma sistemo por kongrui kun la venontaj versioj.\n\nĈu vi deziras ŝalti tiun funkcion ?</string>
-  <string name="update_recovery_off_warning">ATENTO: Kiam tiu funkcio estas malŝaltita, via riparado NE estos ĝisdatigita samtempe kiel via mastruma sistemo.\n\nVenontaj mastrumaj sistemaj ĝisdatigoj eble ne instaleblos kun malnova versio de la riparado.\n\nĈu vi certas ke vi deziras malŝalti tiun funkcion ?</string>
   <!-- Android debugging over WiFi -->
-  <string name="adb_over_network">ADB per reto</string>
-  <string name="adb_over_network_summary">Elibig TCP/IP sencimigadon per retaj interfacoj (Vifio, USB retoj). Tiu agordo estos nuligita post restartigo</string>
-  <string name="adb_over_network_disable_summary">Klaku por malŝalti TCP/IP sencimigadon per retaj interfacoj (Vifio, USB retoj).</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">ATENTIGO: Kiam reta ADB estas ŝaltita, via telefono estas malfermata por entrudiĝoj tra ĉiuj konektitaj retoj!\n\nUzu tiun funkcion nur kiam vi estas konektita al fidindaj retoj.\n\nĈu vi ja volas ŝalti tiun funkcion?</string>
   <!-- Home settings -->
-  <string name="system_reset_default_home">Rekomenci la defaŭltan hejman ekranon</string>
-  <string name="system_home_settings">Agordoj de hejmo</string>
-  <string name="reset_launcher_title">Rekomenci la defaŭltan hejman ekranon</string>
-  <string name="reset_launcher_description">Rekomencigo de defaŭlta hejma ekrano ebligos vin elekti alternativan hejman ekranon (ekz. Trebuchet).\n\nĈu vi deziras rekomencigi vian defaŭltan hejman ekranon?</string>
-  <string name="reset_launcher_tip">Premu la hejman butonon por aperigi la dialogujon por elekti hejman ekranon.</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
-  <string name="enable_terminal_title">Loka terminalo</string>
-  <string name="enable_terminal_summary">Ebligi terminalan aplikaĵon</string>
-  <string name="disable_terminal_summary">Malŝalti terminalan aplikaĵon</string>
-  <string name="enable_terminal_on">Ŝaltita</string>
-  <string name="enable_terminal_off">Malŝaltita</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">Altnivela restartigo</string>
-  <string name="advanced_reboot_summary">Aldoni opciojn en la Pri menuo por rekomencigi per riparada, praŝargila aŭ varma restartigo</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device, within the Reboot Options dialog -->
-  <string name="reboot_reboot">Relanĉi</string>
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
-  <string name="reboot_recovery">Riparado</string>
   <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
-  <string name="reboot_bootloader">Praŝargilo</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
-  <string name="reboot_soft">Varma relanĉado</string>
   <!-- Display settings -->
-  <string name="system_display">Ekrano</string>
-  <string name="system_display_overscan">Overscan</string>
-  <string name="system_display_overscan_description">Kalibri ekranon por adapti al via aparato.</string>
 </resources>
diff --git a/Settings/res/values-eo/strings.xml b/Settings/res/values-eo/strings.xml
index ac62e264..0dc4c6b6 100644
--- a/Settings/res/values-eo/strings.xml
+++ b/Settings/res/values-eo/strings.xml
@@ -16,19 +16,25 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Main app title [CHAR LIMIT=40] -->
+  <string name="settings_app_name">Agordoj</string>
   <!-- Leanback Launcher App Title for main Settings app [CHAR LIMIT=40] -->
+  <string name="launcher_settings_app_name">Agordoj</string>
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
+  <string name="launcher_network_app_name">Reto</string>
   <!-- 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">Aparato</string>
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
+  <string name="add_account">Aldoni konton</string>
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
   <!-- Google services under account settings, title for Search -->
+  <string name="search_title">Serĉi</string>
   <!-- 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] -->
@@ -39,8 +45,17 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Account details settings  [CHAR LIMIT=50] -->
+  <string-array name="account_detail_settings">
+    <item>Nomo</item>
+    <item>Photo</item>
+    <item>Sekureco</item>
+    <item>Google Wallet</item>
+    <item>Purchase History</item>
+    <item>Forigi konton</item>
+  </string-array>
   <!-- Connectivity preferences -->
   <!-- Top level network card title. [CHAR LIMIT=50] -->
+  <string name="connectivity_network">Reto</string>
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
@@ -48,6 +63,7 @@
   <!-- 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">Aplikaĵoj</string>
   <!-- Preference which shows storage status. [CHAR LIMIT=50] -->
   <!-- Preference which shows storage status. [CHAR LIMIT=50] -->
   <!-- Preference which manages backup settings. [CHAR LIMIT=50] -->
@@ -67,6 +83,7 @@
   <!-- Device Paring Status: Connecting. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Error. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Canceled. [CHAR LIMIT=50] -->
+  <string name="accessory_state_canceled">Nuligita</string>
   <!-- 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] -->
@@ -90,17 +107,22 @@
   <!-- 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">Nuligi</string>
   <!-- System -->
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
+  <string name="system_language">Lingvo</string>
   <!-- Preference which manages input method settings. [CHAR LIMIT=50] -->
+  <string name="system_keyboard">Klavaro</string>
   <!-- Preference which manages home screen settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages search and google now settings. [CHAR LIMIT=50] -->
+  <string name="system_search">Serĉi</string>
   <!-- Preference which manages security settings. [CHAR LIMIT=50] -->
   <!-- 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">Alirebleco</string>
   <!-- Preference which manages developer options. [CHAR LIMIT=50] -->
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- About -->
@@ -115,6 +137,7 @@
   <!-- 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] -->
+  <string name="about_version">Versio</string>
   <!-- Preference which shows serial number. [CHAR LIMIT=50] -->
   <!-- Preference which shows build version. [CHAR LIMIT=50] -->
   <!-- Device Info screen. Countdown for user taps to enable development settings [CHAR LIMIT=NONE] -->
@@ -176,6 +199,7 @@
   <!-- Network SSID title on add network form page [CHAR LIMIT=30] -->
   <!-- Security type title on add network form page [CHAR LIMIT=30] -->
   <!-- Password title on add network form page [CHAR LIMIT=30] -->
+  <string name="password">Pasvorto</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]-->
@@ -204,11 +228,13 @@
   <!-- Title to show when the ip settings are invalid [CHAR LIMIT=80] -->
   <!-- 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] -->
+  <string name="wifi_action_try_again">Reprovi</string>
   <!-- Label for action to go back to the list of wifi networks [CHAR LIMIT=50] -->
   <!-- Message to show when wifi is connecting [CHAR LIMIT=80] -->
   <!-- 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">Forgesi reton</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] -->
   <!-- Label for action to try to connect to a different wifi network [CHAR LIMIT=50] -->
@@ -219,6 +245,7 @@
   <!-- Label for action to setup a proxy for the wifi connection [CHAR LIMIT=50] -->
   <!-- Label for action to use dhcp to obtain an ip address for the wifi connection [CHAR LIMIT=50] -->
   <!-- Label for action to save advanced settings [CHAR LIMIT=50] -->
+  <string name="wifi_action_save">Konservi</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] -->
   <!-- Title for action to setup advanced options for the wifi connection [CHAR LIMIT=50] -->
@@ -247,6 +274,7 @@
   <!-- Name to use when we don't know the name of the wifi network the device is connected to [CHAR LIMIT=20] -->
   <!-- Title for action to configure advanced options for a wifi or ethernet connection [CHAR LIMIT=80] -->
   <!-- Description for action to configure advanced options for a wifi or ethernet connection showing a summary of advanced options[CHAR LIMIT=80] -->
+  <string name="connectivity_advanced_options_description"><xliff:g id="ssid">%1$s</xliff:g>, <xliff:g id="ssid">%2$s</xliff:g></string>
   <!-- Strings for Ethernet under Connectivity Setting -->
   <!-- Key for ip settings [CHAR LIMIT=30] -->
   <!-- Title for Test Connection [CHAR LIMIT=50] -->
@@ -258,18 +286,21 @@
   <!-- Title for DNS 2 [CHAR LIMIT=50] -->
   <!-- Title for OK [CHAR LIMIT=50] -->
   <!-- Title for DNS 2 [CHAR LIMIT=50] -->
+  <string name="title_cancel">Nuligi</string>
   <!-- Title of renaming wifi direct device [CHAR LIMIT=50] -->
   <!-- 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] -->
   <!-- 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] -->
+  <string name="storage_apps_usage">Aplikaĵoj</string>
   <!-- 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] -->
   <!-- Storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard 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 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] -->
   <!-- Action to cancel WPS scanning [CHAR LIMIT=50] -->
+  <string name="wifi_wps_cancel_scan">Nuligi</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] -->
@@ -289,6 +320,7 @@
   <!-- Title for automatic date & time [CHAR LIMIT = 80] -->
   <!-- Description for using automatic date & time in date time settings [CHAR LIMIT=100] -->
   <!-- Title for Location in System Settings [CHAR LIMIT=50] -->
+  <string name="system_location">Loko</string>
   <!-- Description for Location in System Settings [CHAR LIMIT=NONE] -->
   <!-- Title for the Google location source in System Settings [CHAR LIMIT=50]-->
   <!-- Description for the Google location source in System Settings [CHAR LIMIT=150]-->
@@ -296,6 +328,7 @@
   <!-- Description for confirming location consent [CHAR LIMIT=NONE] -->
   <!-- Security & location settings screen, section header for settings relating to location -->
   <!-- Header title for SecurityActivity [CHAR LIMIT=50] -->
+  <string name="header_category_system">Sistemo</string>
   <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
   <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
   <!-- Location settings screen, displayed when there's no recent app accessing location -->
@@ -324,6 +357,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">Lingvo</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] -->
@@ -436,6 +470,11 @@
   <!-- Description for action to warn before installing of applications that may cause harm [CHAR LIMIT=NONE]-->
   <!-- Values for HDCP checking preference. -->
   <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <string-array name="hdcp_checking_summaries">
+    <item>Neniam</item>
+    <item>For DRM content</item>
+    <item>Always</item>
+  </string-array>
   <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
   <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
   <!-- Values for OpenGL traces preference. -->
@@ -509,6 +548,7 @@
   <!-- 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">Loko</string>
   <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
   <!-- Action to create a restricted profile [CHAR LIMIT=100] -->
   <!-- Action to switch to a restricted profile [CHAR LIMIT=100] -->
@@ -516,6 +556,7 @@
   <!-- Title for action to delete a restricted profile [CHAR LIMIT=100] -->
   <!-- DO NOT TRANSLATE Description 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">Agordoj</string>
   <!-- Title for action to configure apps for a restricted profile [CHAR LIMIT=100] -->
   <!-- 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] -->
@@ -528,6 +569,7 @@
   <!-- Text to indicate user should enter the password to get out of restricted profile[CHAR LIMIT=100] -->
   <!-- Title for dialog to remove restricted user [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
+  <string name="restriction_description"><xliff:g id="description">%1$s</xliff:g>\n<xliff:g id="value">%2$s</xliff:g></string>
   <!-- PIN UX -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
@@ -542,6 +584,7 @@
   <!-- Message shown in the dialog when the user entered the wrong. [CHAR LIMIT=128] -->
   <!-- Name of PIN dialog button for OK. [CHAR LIMIT=8] -->
   <!-- Name of PIN dialog button for cancel. [CHAR LIMIT=8] -->
+  <string name="pin_button_cancel">Nuligi</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] -->
 </resources>
diff --git a/Settings/res/values-es-rCO/arrays.xml b/Settings/res/values-es-rCO/arrays.xml
new file mode 100644
index 00000000..4455ad7b
--- /dev/null
+++ b/Settings/res/values-es-rCO/arrays.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+  <!-- Display settings.  The delay in inactivity before the daydream starts. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay after the daydream starts when the screen goes off. -->
+  <!-- Do not translate. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=35] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for HDMI optimization preference values [CHAR LIMIT=60] -->
+  <!-- Values for HDMI optimization preference values DO NOT TRANSLATE -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- 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] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+</resources>
diff --git a/Settings/res/values-es-rCO/cm_strings.xml b/Settings/res/values-es-rCO/cm_strings.xml
new file mode 100644
index 00000000..eddd58d1
--- /dev/null
+++ b/Settings/res/values-es-rCO/cm_strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- CM Updater -->
+  <!-- About screen, CyanogenMod version -->
+  <!-- About screen, status item label  [CHAR LIMIT=60] -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] 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 -->
+  <!-- About screen, build date -->
+  <!-- About screen, kernel version -->
+  <!-- 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] -->
+  <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Setting title for root access -->
+  <!-- Setting for updating Cyanogen recovery -->
+  <!-- Android debugging over WiFi -->
+  <!-- Warning for Adb over Network -->
+  <!-- Home settings -->
+  <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Advanced reboot options -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the device, within the Reboot Options dialog -->
+  <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Display settings -->
+</resources>
diff --git a/Settings/res/values-es-rCO/strings.xml b/Settings/res/values-es-rCO/strings.xml
new file mode 100644
index 00000000..ac62e264
--- /dev/null
+++ b/Settings/res/values-es-rCO/strings.xml
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Main app title [CHAR LIMIT=40] -->
+  <!-- Leanback Launcher App Title for main Settings app [CHAR LIMIT=40] -->
+  <!-- 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] -->
+  <!-- Header title for preferences [CHAR LIMIT=50] -->
+  <!-- Header title for accessories [CHAR LIMIT=50] -->
+  <!-- Header title for personal [CHAR LIMIT=50] -->
+  <!-- Account preferences -->
+  <!-- Preference which adds an account [CHAR LIMIT=50] -->
+  <!-- Header for sync [CHAR LIMIT=50] -->
+  <!-- Header for remove account [CHAR LIMIT=50] -->
+  <!-- Google services under account settings, title for Search -->
+  <!-- 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] -->
+  <!-- Sync status: in progress [CHAR LIMIT=50]-->
+  <!-- Sync status: last synced [CHAR LIMIT=50]-->
+  <!-- Sync status: disabled [CHAR LIMIT=50] -->
+  <!-- Sync description if sync is failing [CHAR LIMIT=NONE] -->
+  <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
+  <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
+  <!-- Account details settings  [CHAR LIMIT=50] -->
+  <!-- Connectivity preferences -->
+  <!-- Top level network card title. [CHAR LIMIT=50] -->
+  <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages ethernet settings. [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] -->
+  <!-- Preference which shows storage status. [CHAR LIMIT=50] -->
+  <!-- Preference which shows storage status. [CHAR LIMIT=50] -->
+  <!-- Preference which manages backup settings. [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
+  <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
+  <!-- Remote and Accessories -->
+  <!-- Preference which manages remote control settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages camera settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
+  <!-- Description for Connected accessory[CHAR LIMIT=50] -->
+  <!-- Remote and Accessories -->
+  <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for pin entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- 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] -->
+  <!-- System -->
+  <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages input method settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages home screen settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages search and google now settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages security settings. [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Preference which manages developer options. [CHAR LIMIT=50] -->
+  <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
+  <!-- About -->
+  <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
+  <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
+  <!-- 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 warranty info. [CHAR LIMIT=50] -->
+  <!-- Preference which shows open source licenses [CHAR LIMIT=50]-->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Wifi -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!--
+         Status for networks disabled from authentication failure (wrong password
+         or certificate).
+    -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!--
+         Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]
+    -->
+  <!--
+         Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string
+    -->
+  <!--
+         Substring of wifi status for wifi with authentication.  This version is for when the
+         string is first in the list (titlecase in english)
+    -->
+  <!--
+         Substring of wifi status for wifi with authentication.  This version is for when the
+         string is not first in the list (lowercase in english)
+    -->
+  <!-- wifi signal strength array [CHAR LIMIT=30] -->
+  <!-- titles for connection status -->
+  <!-- label mac address [CHAR LIMIT=50] -->
+  <!-- label signal strength [CHAR LIMIT=50] -->
+  <!-- label IP address [CHAR LIMIT=50] -->
+  <!-- label SSID [CHAR LIMIT=50] -->
+  <!-- label internet connection [CHAR LIMIT=50] -->
+  <!-- contents for connection status -->
+  <!-- Connected [CHAR LIMIT=50] -->
+  <!-- Not connected [CHAR LIMIT=50] -->
+  <!-- Wifi setting headers [CHAR LIMIT=50] -->
+  <!-- Other Options under Wifi Settings headers [CHAR LIMIT=50] -->
+  <!-- Strings for Add Network under Connectivity Setting -->
+  <!-- Add network title on add network form page [CHAR LIMIT=30] -->
+  <!-- Network SSID title on add network form page [CHAR LIMIT=30] -->
+  <!-- Security type title on add network form page [CHAR LIMIT=30] -->
+  <!-- Password title on add network form page [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Wifi Security type indicating WEP security [CHAR LIMIT=30] -->
+  <!-- Wifi Security type indicating WPA/WPA2 security [CHAR LIMIT=30] -->
+  <!-- Wifi Security type indicating EAP security [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Title to show when asking if advanced settings should be used for this wifi connection [CHAR LIMIT=80] -->
+  <!-- Title to show when asking if a proxy should be used for this wifi connection [CHAR LIMIT=80] -->
+  <!-- Title to show when asking for the proxy hostname for this wifi connection [CHAR LIMIT=80] -->
+  <!-- Title to show when asking for the proxy port for this wifi connection [CHAR LIMIT=80] -->
+  <!-- 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] -->
+  <!-- Title to show when asking for the static ip address to use for this wifi connection [CHAR LIMIT=80] -->
+  <!-- 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] -->
+  <!-- Title to show when asking for the second DNS to use for this wifi connection [CHAR LIMIT=80] -->
+  <!-- Title to show when the proxy settings are invalid [CHAR LIMIT=80] -->
+  <!-- Title to show when the ip settings are invalid [CHAR LIMIT=80] -->
+  <!-- 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] -->
+  <!-- Message to show when wifi is connecting [CHAR LIMIT=80] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Label for action to use dhcp to obtain an ip address for the wifi connection [CHAR LIMIT=50] -->
+  <!-- Label for action to save advanced settings [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title for action to setup advanced options for the wifi connection [CHAR LIMIT=50] -->
+  <!-- Description for action to setup advanced options for the wifi connection [CHAR LIMIT=50] -->
+  <!-- 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]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Hint text for the IP address -->
+  <!-- Hint text for DNS -->
+  <!-- Hint text for DNS -->
+  <!-- Hint text for the gateway -->
+  <!-- Hint text for network prefix length -->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- 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] -->
+  <!-- Title to show indicating the user is not connected [CHAR LIMIT=100] -->
+  <!-- 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] -->
+  <!-- Title for action to configure advanced options for a wifi or ethernet connection [CHAR LIMIT=80] -->
+  <!-- Description for action to configure advanced options for a wifi or ethernet connection showing a summary of advanced options[CHAR LIMIT=80] -->
+  <!-- Strings for Ethernet under Connectivity Setting -->
+  <!-- Key for ip settings [CHAR LIMIT=30] -->
+  <!-- Title for Test Connection [CHAR LIMIT=50] -->
+  <!-- DHCP in IP setting [CHAR LIMIT=50] -->
+  <!-- Static in IP setting [CHAR LIMIT=50] -->
+  <!-- Gateway title in network setting [CHAR LIMIT=50] -->
+  <!-- Title for network prefix length in network setting [CHAR LIMIT=50] -->
+  <!-- Title for DNS 1 [CHAR LIMIT=50] -->
+  <!-- Title for DNS 2 [CHAR LIMIT=50] -->
+  <!-- Title for OK [CHAR LIMIT=50] -->
+  <!-- Title for DNS 2 [CHAR LIMIT=50] -->
+  <!-- Title of renaming wifi direct device [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard 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 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] -->
+  <!-- Action to cancel WPS scanning [CHAR LIMIT=50] -->
+  <!-- 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 setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- 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] -->
+  <!-- Title for Time in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for Set Date in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for Set Time in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for Set Time Zone in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for Set time format in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for automatic date & time [CHAR LIMIT = 80] -->
+  <!-- Description for using automatic date & time in date time settings [CHAR LIMIT=100] -->
+  <!-- Title for Location in System Settings [CHAR LIMIT=50] -->
+  <!-- Description for Location in System Settings [CHAR LIMIT=NONE] -->
+  <!-- Title for the Google location source in System Settings [CHAR LIMIT=50]-->
+  <!-- Description for the Google location source in System Settings [CHAR LIMIT=150]-->
+  <!-- Title for confirming location consent [CHAR LIMIT=50] -->
+  <!-- Description for confirming location consent [CHAR LIMIT=NONE] -->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Header title for SecurityActivity [CHAR LIMIT=50] -->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [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 -->
+  <!-- [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 -->
+  <!-- [CAR LIMIT=100] Location services screen title for third party location services -->
+  <!-- [CHAR LIMIT=100] Location services screen, title for Location reporting -->
+  <!-- [CHAR LIMIT=100] Location services screen, title for Location history -->
+  <!-- [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] -->
+  <!-- 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] -->
+  <!-- Title for captions display setting [CHAR LIMIT=50] -->
+  <!-- Subtext used under the captions_display string to denote that captions will be shown. [CHAR LIMIT=50] -->
+  <!-- Subtext used under the captions_display string to denote that captions will NOT be shown. [CHAR LIMIT=50] -->
+  <!-- Description for captions display setting [CHAR LIMIT=100] -->
+  <!-- Title for captions configure setting [CHAR LIMIT=50] -->
+  <!-- Title for captions language setting [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title for captions font family setting [CHAR LIMIT=50] -->
+  <!-- Title for captions text color setting [CHAR LIMIT=50] -->
+  <!-- Title for captions edge type setting [CHAR LIMIT=50] -->
+  <!-- Title for captions edge color setting [CHAR LIMIT=50] -->
+  <!-- Title for captions background color setting [CHAR LIMIT=50] -->
+  <!-- Title for captions bacground opacity setting [CHAR LIMIT=50] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Title for captions text opacity setting [CHAR LIMIT=50] -->
+  <!-- Title for captions window color setting [CHAR LIMIT=50] -->
+  <!-- Title for captions window opacity setting [CHAR LIMIT=50] -->
+  <!-- Label for no color. [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for accessibility service status [CHAR LIMIT=50] -->
+  <!-- Title for accessibility service configuration [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Description for confirmation screen when turning OFF accessibility service[[CHAR LIMIT=NONE] -->
+  <!-- Title for text to speech output in accessibility settings [CHAR LIMIT=50] -->
+  <!-- Title for Set Speak passwords in System Settings Accessibility [CHAR LIMIT=50] -->
+  <!-- Title for Set Preferred engine in System Settings Accessibility [CHAR LIMIT=50] -->
+  <!-- Title for Set Speech rate in System Settings Accessibility [CHAR LIMIT=50] -->
+  <!-- Title for Set Play sample in System Settings Accessibility [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Title for Set Take bug report in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Backup password in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title for reboot confirmation in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title for HDCP checking option in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Bluetooth HCI logging Developer option [CHAR LIMIT=50] -->
+  <!-- Title for Set Email address in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set USB debugging in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Allow mock locations in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Select debug app in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Wait for debugger in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Verify apps over USB in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Description for Set verify apps over USB in system settings develop opetions [CHAR LIMIT=150] -->
+  <!-- Title for WiFi Verbose Logging in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Description for Wifi Verbose Logging in system settings develop opetions [CHAR LIMIT=150] -->
+  <!-- Title for Set Show touches in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Pointer location in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show layout bounds in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show GPU view updates in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show hardware layer in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show GPU overdraw in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show surface updates in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Window animation scale in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Transition animation scale in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Title for Set Background process limit in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Title for Set Show all ANRs in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Description for Take bug report in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for backup password in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for stay awake System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for hdcp checking System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for HDMI optimization System Settings Developer options [CHAR LIMIT=200] -->
+  <!-- Description for Bluetooth HCI Logging Developer option [CHAR LIMIT=100] -->
+  <!-- Description for usb debugging in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for wait for debugger in System Settings Developer options [CHAR LIMIT=120] -->
+  <!-- Description for show layout bounds in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show GPU view updates in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show hardware layer in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show gpu overdraw in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show surface updates in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for strict mode enabled in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- The option in the date-format picker for using the normal format
+         called for by the user's locale. -->
+  <!-- General use strings -->
+  <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
+  <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
+  <!-- Security -->
+  <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
+  <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
+  <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
+  <!-- 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]-->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!--  Description for the preference screen to enable the global gesture that turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices [CHAR LIMIT=30] -->
+  <!-- Text to speech rate values [DO NOT TRANSLATE] -->
+  <!-- Default Text to Speach rate. Should match value for "Normal" in the above array. [DO NOT TRANSLATE] -->
+  <!-- Title for choose account type screen [CHAR LIMIT=100]-->
+  <!-- Title for choose account screen [CHAR LIMIT=80]-->
+  <!-- Action option which adds a new account [CHAR LIMIT=80]-->
+  <!-- Keyboard Settings -->
+  <!-- Title for Current Keyboard [CHAR LIMIT=80] -->
+  <!-- Title for configure current keyboard [CHAR LIMIT=80] -->
+  <!-- Description for configure current keyboard [CHAR LIMIT=100] -->
+  <!-- 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] -->
+  <!-- Action option which allows the enabling or disabling of wifi display [CHAR LIMIT=40] -->
+  <!-- Action option which allows the enabling or disabling the PIN requirement of wifi display [CHAR LIMIT=40] -->
+  <!-- Header used to list a connected Remote and its serial number. %1 gets replaced with the serial number. [CHAR LIMIT=40] -->
+  <!-- Bug Report strings. NOTE: these will not be shown to external users, only internal ones. -->
+  <!-- Message shown when a bug report is being collected [CHAR LIMIT=100] -->
+  <!-- Message shown when a bug report could not be collected [CHAR LIMIT=100] -->
+  <!-- Disambiguation Activity-->
+  <!-- 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]-->
+  <!-- Option to only use the selected option this time. See the "Complete action using" dialog title [CHAR LIMIT=50]-->
+  <!-- Text to display when there are no activities found to display in the activity chooser. See the whichApplication title.[CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title of CEC device settings [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Name of predefined name for TV input (Gaming device) [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Description of option to hide [CHAR LIMIT=100] -->
+  <!-- Title format of entering custom label activity [CHAR LIMIT=30] -->
+  <!-- Option to enable HDMI control [CHAR LIMIT=30] -->
+  <!-- Description of HDMI control option [CHAR LIMIT=50] -->
+  <!-- Option to enable device auto power off [CHAR LIMIT=30] -->
+  <!-- Description of device auto power off option [CHAR LIMIT=50] -->
+  <!-- Option to enable TV auto power on [CHAR LIMIT=30] -->
+  <!-- Description of TV auto power on [CHAR LIMIT=50] -->
+  <!-- Header for connected TV input(s) [CHAR LIMIT=30] -->
+  <!-- Header for standby TV input(s) [CHAR LIMIT=30] -->
+  <!-- Header for disconnected TV input(s) [CHAR LIMIT=30] -->
+  <!-- State of a TV input for 'connected' [CHAR LIMIT=30] -->
+  <!-- State of a TV input for 'standby' [CHAR LIMIT=30] -->
+  <!-- State of a TV input for 'disconnected' [CHAR LIMIT=30] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- 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] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Action to create a restricted profile [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] -->
+  <!-- DO NOT TRANSLATE Description for action to delete a restricted profile [CHAR LIMIT=100] -->
+  <!-- Title for action to configure a restricted profile [CHAR LIMIT=100] -->
+  <!-- Title for action to configure apps for a restricted profile [CHAR LIMIT=100] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Text to indicate user should enter a new password [CHAR LIMIT=100] -->
+  <!-- Text to indicate user should enter a the password they just entered [CHAR LIMIT=100] -->
+  <!-- Text to indicate user should enter the password to get out of restricted profile[CHAR LIMIT=100] -->
+  <!-- Title for dialog to remove restricted user [CHAR LIMIT=100] -->
+  <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
+  <!-- PIN UX -->
+  <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
+         [CHAR LIMIT=50] -->
+  <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
+         [CHAR LIMIT=50] -->
+  <!-- Title of PIN dialog when an user tries to change Parental control setting.
+         [CHAR LIMIT=50] -->
+  <!-- Title of PIN dialog when an user is asked to set a PIN for the first time.
+         [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Name of PIN dialog button for OK. [CHAR LIMIT=8] -->
+  <!-- Name of PIN dialog button for cancel. [CHAR LIMIT=8] -->
+  <!-- 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] -->
+</resources>
diff --git a/Settings/res/values-ga-rIE/arrays.xml b/Settings/res/values-ga-rIE/arrays.xml
new file mode 100644
index 00000000..4455ad7b
--- /dev/null
+++ b/Settings/res/values-ga-rIE/arrays.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+  <!-- Display settings.  The delay in inactivity before the daydream starts. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay after the daydream starts when the screen goes off. -->
+  <!-- Do not translate. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=35] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for HDMI optimization preference values [CHAR LIMIT=60] -->
+  <!-- Values for HDMI optimization preference values DO NOT TRANSLATE -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- 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] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+</resources>
diff --git a/Settings/res/values-ga-rIE/cm_strings.xml b/Settings/res/values-ga-rIE/cm_strings.xml
new file mode 100644
index 00000000..eddd58d1
--- /dev/null
+++ b/Settings/res/values-ga-rIE/cm_strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- CM Updater -->
+  <!-- About screen, CyanogenMod version -->
+  <!-- About screen, status item label  [CHAR LIMIT=60] -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] 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 -->
+  <!-- About screen, build date -->
+  <!-- About screen, kernel version -->
+  <!-- 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] -->
+  <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Setting title for root access -->
+  <!-- Setting for updating Cyanogen recovery -->
+  <!-- Android debugging over WiFi -->
+  <!-- Warning for Adb over Network -->
+  <!-- Home settings -->
+  <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Advanced reboot options -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the device, within the Reboot Options dialog -->
+  <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Display settings -->
+</resources>
diff --git a/Settings/res/values-ga-rIE/strings.xml b/Settings/res/values-ga-rIE/strings.xml
new file mode 100644
index 00000000..ac62e264
--- /dev/null
+++ b/Settings/res/values-ga-rIE/strings.xml
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Main app title [CHAR LIMIT=40] -->
+  <!-- Leanback Launcher App Title for main Settings app [CHAR LIMIT=40] -->
+  <!-- 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] -->
+  <!-- Header title for preferences [CHAR LIMIT=50] -->
+  <!-- Header title for accessories [CHAR LIMIT=50] -->
+  <!-- Header title for personal [CHAR LIMIT=50] -->
+  <!-- Account preferences -->
+  <!-- Preference which adds an account [CHAR LIMIT=50] -->
+  <!-- Header for sync [CHAR LIMIT=50] -->
+  <!-- Header for remove account [CHAR LIMIT=50] -->
+  <!-- Google services under account settings, title for Search -->
+  <!-- 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] -->
+  <!-- Sync status: in progress [CHAR LIMIT=50]-->
+  <!-- Sync status: last synced [CHAR LIMIT=50]-->
+  <!-- Sync status: disabled [CHAR LIMIT=50] -->
+  <!-- Sync description if sync is failing [CHAR LIMIT=NONE] -->
+  <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
+  <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
+  <!-- Account details settings  [CHAR LIMIT=50] -->
+  <!-- Connectivity preferences -->
+  <!-- Top level network card title. [CHAR LIMIT=50] -->
+  <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages ethernet settings. [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] -->
+  <!-- Preference which shows storage status. [CHAR LIMIT=50] -->
+  <!-- Preference which shows storage status. [CHAR LIMIT=50] -->
+  <!-- Preference which manages backup settings. [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
+  <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
+  <!-- Remote and Accessories -->
+  <!-- Preference which manages remote control settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages camera settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
+  <!-- Description for Connected accessory[CHAR LIMIT=50] -->
+  <!-- Remote and Accessories -->
+  <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for pin entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- 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] -->
+  <!-- System -->
+  <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages input method settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages home screen settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages search and google now settings. [CHAR LIMIT=50] -->
+  <!-- Preference which manages security settings. [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Preference which manages developer options. [CHAR LIMIT=50] -->
+  <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
+  <!-- About -->
+  <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
+  <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
+  <!-- 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 warranty info. [CHAR LIMIT=50] -->
+  <!-- Preference which shows open source licenses [CHAR LIMIT=50]-->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Wifi -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!--
+         Status for networks disabled from authentication failure (wrong password
+         or certificate).
+    -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!--
+         Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]
+    -->
+  <!--
+         Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string
+    -->
+  <!--
+         Substring of wifi status for wifi with authentication.  This version is for when the
+         string is first in the list (titlecase in english)
+    -->
+  <!--
+         Substring of wifi status for wifi with authentication.  This version is for when the
+         string is not first in the list (lowercase in english)
+    -->
+  <!-- wifi signal strength array [CHAR LIMIT=30] -->
+  <!-- titles for connection status -->
+  <!-- label mac address [CHAR LIMIT=50] -->
+  <!-- label signal strength [CHAR LIMIT=50] -->
+  <!-- label IP address [CHAR LIMIT=50] -->
+  <!-- label SSID [CHAR LIMIT=50] -->
+  <!-- label internet connection [CHAR LIMIT=50] -->
+  <!-- contents for connection status -->
+  <!-- Connected [CHAR LIMIT=50] -->
+  <!-- Not connected [CHAR LIMIT=50] -->
+  <!-- Wifi setting headers [CHAR LIMIT=50] -->
+  <!-- Other Options under Wifi Settings headers [CHAR LIMIT=50] -->
+  <!-- Strings for Add Network under Connectivity Setting -->
+  <!-- Add network title on add network form page [CHAR LIMIT=30] -->
+  <!-- Network SSID title on add network form page [CHAR LIMIT=30] -->
+  <!-- Security type title on add network form page [CHAR LIMIT=30] -->
+  <!-- Password title on add network form page [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Wifi Security type indicating WEP security [CHAR LIMIT=30] -->
+  <!-- Wifi Security type indicating WPA/WPA2 security [CHAR LIMIT=30] -->
+  <!-- Wifi Security type indicating EAP security [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Title to show when asking if advanced settings should be used for this wifi connection [CHAR LIMIT=80] -->
+  <!-- Title to show when asking if a proxy should be used for this wifi connection [CHAR LIMIT=80] -->
+  <!-- Title to show when asking for the proxy hostname for this wifi connection [CHAR LIMIT=80] -->
+  <!-- Title to show when asking for the proxy port for this wifi connection [CHAR LIMIT=80] -->
+  <!-- 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] -->
+  <!-- Title to show when asking for the static ip address to use for this wifi connection [CHAR LIMIT=80] -->
+  <!-- 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] -->
+  <!-- Title to show when asking for the second DNS to use for this wifi connection [CHAR LIMIT=80] -->
+  <!-- Title to show when the proxy settings are invalid [CHAR LIMIT=80] -->
+  <!-- Title to show when the ip settings are invalid [CHAR LIMIT=80] -->
+  <!-- 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] -->
+  <!-- Message to show when wifi is connecting [CHAR LIMIT=80] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Label for action to use dhcp to obtain an ip address for the wifi connection [CHAR LIMIT=50] -->
+  <!-- Label for action to save advanced settings [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title for action to setup advanced options for the wifi connection [CHAR LIMIT=50] -->
+  <!-- Description for action to setup advanced options for the wifi connection [CHAR LIMIT=50] -->
+  <!-- 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]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Hint text for the IP address -->
+  <!-- Hint text for DNS -->
+  <!-- Hint text for DNS -->
+  <!-- Hint text for the gateway -->
+  <!-- Hint text for network prefix length -->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- 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] -->
+  <!-- Title to show indicating the user is not connected [CHAR LIMIT=100] -->
+  <!-- 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] -->
+  <!-- Title for action to configure advanced options for a wifi or ethernet connection [CHAR LIMIT=80] -->
+  <!-- Description for action to configure advanced options for a wifi or ethernet connection showing a summary of advanced options[CHAR LIMIT=80] -->
+  <!-- Strings for Ethernet under Connectivity Setting -->
+  <!-- Key for ip settings [CHAR LIMIT=30] -->
+  <!-- Title for Test Connection [CHAR LIMIT=50] -->
+  <!-- DHCP in IP setting [CHAR LIMIT=50] -->
+  <!-- Static in IP setting [CHAR LIMIT=50] -->
+  <!-- Gateway title in network setting [CHAR LIMIT=50] -->
+  <!-- Title for network prefix length in network setting [CHAR LIMIT=50] -->
+  <!-- Title for DNS 1 [CHAR LIMIT=50] -->
+  <!-- Title for DNS 2 [CHAR LIMIT=50] -->
+  <!-- Title for OK [CHAR LIMIT=50] -->
+  <!-- Title for DNS 2 [CHAR LIMIT=50] -->
+  <!-- Title of renaming wifi direct device [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard 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 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] -->
+  <!-- Action to cancel WPS scanning [CHAR LIMIT=50] -->
+  <!-- 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 setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- 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] -->
+  <!-- Title for Time in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for Set Date in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for Set Time in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for Set Time Zone in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for Set time format in System Settings Date Time [CHAR LIMIT=50] -->
+  <!-- Title for automatic date & time [CHAR LIMIT = 80] -->
+  <!-- Description for using automatic date & time in date time settings [CHAR LIMIT=100] -->
+  <!-- Title for Location in System Settings [CHAR LIMIT=50] -->
+  <!-- Description for Location in System Settings [CHAR LIMIT=NONE] -->
+  <!-- Title for the Google location source in System Settings [CHAR LIMIT=50]-->
+  <!-- Description for the Google location source in System Settings [CHAR LIMIT=150]-->
+  <!-- Title for confirming location consent [CHAR LIMIT=50] -->
+  <!-- Description for confirming location consent [CHAR LIMIT=NONE] -->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Header title for SecurityActivity [CHAR LIMIT=50] -->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [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 -->
+  <!-- [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 -->
+  <!-- [CAR LIMIT=100] Location services screen title for third party location services -->
+  <!-- [CHAR LIMIT=100] Location services screen, title for Location reporting -->
+  <!-- [CHAR LIMIT=100] Location services screen, title for Location history -->
+  <!-- [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] -->
+  <!-- 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] -->
+  <!-- Title for captions display setting [CHAR LIMIT=50] -->
+  <!-- Subtext used under the captions_display string to denote that captions will be shown. [CHAR LIMIT=50] -->
+  <!-- Subtext used under the captions_display string to denote that captions will NOT be shown. [CHAR LIMIT=50] -->
+  <!-- Description for captions display setting [CHAR LIMIT=100] -->
+  <!-- Title for captions configure setting [CHAR LIMIT=50] -->
+  <!-- Title for captions language setting [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title for captions font family setting [CHAR LIMIT=50] -->
+  <!-- Title for captions text color setting [CHAR LIMIT=50] -->
+  <!-- Title for captions edge type setting [CHAR LIMIT=50] -->
+  <!-- Title for captions edge color setting [CHAR LIMIT=50] -->
+  <!-- Title for captions background color setting [CHAR LIMIT=50] -->
+  <!-- Title for captions bacground opacity setting [CHAR LIMIT=50] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Title for captions text opacity setting [CHAR LIMIT=50] -->
+  <!-- Title for captions window color setting [CHAR LIMIT=50] -->
+  <!-- Title for captions window opacity setting [CHAR LIMIT=50] -->
+  <!-- Label for no color. [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for accessibility service status [CHAR LIMIT=50] -->
+  <!-- Title for accessibility service configuration [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Description for confirmation screen when turning OFF accessibility service[[CHAR LIMIT=NONE] -->
+  <!-- Title for text to speech output in accessibility settings [CHAR LIMIT=50] -->
+  <!-- Title for Set Speak passwords in System Settings Accessibility [CHAR LIMIT=50] -->
+  <!-- Title for Set Preferred engine in System Settings Accessibility [CHAR LIMIT=50] -->
+  <!-- Title for Set Speech rate in System Settings Accessibility [CHAR LIMIT=50] -->
+  <!-- Title for Set Play sample in System Settings Accessibility [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Title for Set Take bug report in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Backup password in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title for reboot confirmation in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title for HDCP checking option in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Bluetooth HCI logging Developer option [CHAR LIMIT=50] -->
+  <!-- Title for Set Email address in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set USB debugging in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Allow mock locations in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Select debug app in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Wait for debugger in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Verify apps over USB in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Description for Set verify apps over USB in system settings develop opetions [CHAR LIMIT=150] -->
+  <!-- Title for WiFi Verbose Logging in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Description for Wifi Verbose Logging in system settings develop opetions [CHAR LIMIT=150] -->
+  <!-- Title for Set Show touches in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Pointer location in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show layout bounds in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show GPU view updates in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show hardware layer in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show GPU overdraw in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Show surface updates in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Window animation scale in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Title for Set Transition animation scale in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Title for Set Background process limit in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Title for Set Show all ANRs in System Settings Developer options [CHAR LIMIT=50] -->
+  <!-- Description for Take bug report in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for backup password in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for stay awake System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for hdcp checking System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for HDMI optimization System Settings Developer options [CHAR LIMIT=200] -->
+  <!-- Description for Bluetooth HCI Logging Developer option [CHAR LIMIT=100] -->
+  <!-- Description for usb debugging in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for wait for debugger in System Settings Developer options [CHAR LIMIT=120] -->
+  <!-- Description for show layout bounds in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show GPU view updates in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show hardware layer in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show gpu overdraw in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show surface updates in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for strict mode enabled in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
+  <!-- The option in the date-format picker for using the normal format
+         called for by the user's locale. -->
+  <!-- General use strings -->
+  <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
+  <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
+  <!-- Security -->
+  <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
+  <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
+  <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
+  <!-- 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]-->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!--  Description for the preference screen to enable the global gesture that turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices [CHAR LIMIT=30] -->
+  <!-- Text to speech rate values [DO NOT TRANSLATE] -->
+  <!-- Default Text to Speach rate. Should match value for "Normal" in the above array. [DO NOT TRANSLATE] -->
+  <!-- Title for choose account type screen [CHAR LIMIT=100]-->
+  <!-- Title for choose account screen [CHAR LIMIT=80]-->
+  <!-- Action option which adds a new account [CHAR LIMIT=80]-->
+  <!-- Keyboard Settings -->
+  <!-- Title for Current Keyboard [CHAR LIMIT=80] -->
+  <!-- Title for configure current keyboard [CHAR LIMIT=80] -->
+  <!-- Description for configure current keyboard [CHAR LIMIT=100] -->
+  <!-- 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] -->
+  <!-- Action option which allows the enabling or disabling of wifi display [CHAR LIMIT=40] -->
+  <!-- Action option which allows the enabling or disabling the PIN requirement of wifi display [CHAR LIMIT=40] -->
+  <!-- Header used to list a connected Remote and its serial number. %1 gets replaced with the serial number. [CHAR LIMIT=40] -->
+  <!-- Bug Report strings. NOTE: these will not be shown to external users, only internal ones. -->
+  <!-- Message shown when a bug report is being collected [CHAR LIMIT=100] -->
+  <!-- Message shown when a bug report could not be collected [CHAR LIMIT=100] -->
+  <!-- Disambiguation Activity-->
+  <!-- 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]-->
+  <!-- Option to only use the selected option this time. See the "Complete action using" dialog title [CHAR LIMIT=50]-->
+  <!-- Text to display when there are no activities found to display in the activity chooser. See the whichApplication title.[CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Title of CEC device settings [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Name of predefined name for TV input (Gaming device) [CHAR LIMIT=30] -->
+  <!-- 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] -->
+  <!-- Description of option to hide [CHAR LIMIT=100] -->
+  <!-- Title format of entering custom label activity [CHAR LIMIT=30] -->
+  <!-- Option to enable HDMI control [CHAR LIMIT=30] -->
+  <!-- Description of HDMI control option [CHAR LIMIT=50] -->
+  <!-- Option to enable device auto power off [CHAR LIMIT=30] -->
+  <!-- Description of device auto power off option [CHAR LIMIT=50] -->
+  <!-- Option to enable TV auto power on [CHAR LIMIT=30] -->
+  <!-- Description of TV auto power on [CHAR LIMIT=50] -->
+  <!-- Header for connected TV input(s) [CHAR LIMIT=30] -->
+  <!-- Header for standby TV input(s) [CHAR LIMIT=30] -->
+  <!-- Header for disconnected TV input(s) [CHAR LIMIT=30] -->
+  <!-- State of a TV input for 'connected' [CHAR LIMIT=30] -->
+  <!-- State of a TV input for 'standby' [CHAR LIMIT=30] -->
+  <!-- State of a TV input for 'disconnected' [CHAR LIMIT=30] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- 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] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Action to create a restricted profile [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] -->
+  <!-- DO NOT TRANSLATE Description for action to delete a restricted profile [CHAR LIMIT=100] -->
+  <!-- Title for action to configure a restricted profile [CHAR LIMIT=100] -->
+  <!-- Title for action to configure apps for a restricted profile [CHAR LIMIT=100] -->
+  <!-- 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] -->
+  <!-- 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] -->
+  <!-- Text to indicate user should enter a new password [CHAR LIMIT=100] -->
+  <!-- Text to indicate user should enter a the password they just entered [CHAR LIMIT=100] -->
+  <!-- Text to indicate user should enter the password to get out of restricted profile[CHAR LIMIT=100] -->
+  <!-- Title for dialog to remove restricted user [CHAR LIMIT=100] -->
+  <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
+  <!-- PIN UX -->
+  <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
+         [CHAR LIMIT=50] -->
+  <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
+         [CHAR LIMIT=50] -->
+  <!-- Title of PIN dialog when an user tries to change Parental control setting.
+         [CHAR LIMIT=50] -->
+  <!-- Title of PIN dialog when an user is asked to set a PIN for the first time.
+         [CHAR LIMIT=50] -->
+  <!-- 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] -->
+  <!-- Name of PIN dialog button for OK. [CHAR LIMIT=8] -->
+  <!-- Name of PIN dialog button for cancel. [CHAR LIMIT=8] -->
+  <!-- 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] -->
+</resources>
diff --git a/Settings/res/values-gl-rES/cm_strings.xml b/Settings/res/values-gl-rES/cm_strings.xml
index c9534cff..0f2114bf 100644
--- a/Settings/res/values-gl-rES/cm_strings.xml
+++ b/Settings/res/values-gl-rES/cm_strings.xml
@@ -23,11 +23,16 @@
   <!-- About screen, status item label  [CHAR LIMIT=60] -->
   <string name="security_patch">Nivel de parche de seguridade de Android</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">Estás a<xliff:g id="step_count">%1$d</xliff:g> paso de activar os axustes de desenvolvemento.</item>
+    <item quantity="other">Estás a<xliff:g id="step_count">%1$d</xliff:g> pasos de activar os axustes de desenvolvemento.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">Activouse a configuración de desenvolvemento!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already_cm">Non fai falla, a configuración de desenvolvemento xa está activa.</string>
   <!-- About screen, build date -->
+  <string name="about_build_date">Data de compilación</string>
   <!-- About screen, kernel version -->
   <string name="about_kernel_version">Versión do kernel</string>
   <!-- About screen, SELinux status -->
@@ -36,27 +41,56 @@
     These are displayed by the settings app in the about section. -->
   <string name="selinux_status_disabled">Desactivado</string>
   <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 comezar a utilizar CyanogenMod asegúrese de que o dispositivo Bluetooth está en modo emparellamento. En Nexus Remote, isto faise premendo atrás e inicio ao mesmo tempo.</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 as aplicacións seleccionen acceso como superusuarios é moi perigoso e podería pór en perigo a seguridade do sistema!</string>
   <string name="root_access_none">Desactivado</string>
+  <string name="root_access_apps">Só aplicacións</string>
+  <string name="root_access_adb">Só ADB</string>
+  <string name="root_access_all">Aplicacións e ADB</string>
   <!-- Setting for updating Cyanogen recovery -->
+  <string name="update_recovery_title">Recuperación Cyanogen</string>
+  <string name="update_recovery_on_summary">Actualizar coas actualizacións de sistema</string>
   <string name="update_recovery_off_summary">Non actualizar coas actualizacións de sistema</string>
+  <string name="update_recovery_on_warning">AVISO: Se ten esta característica activada, a recuperación instalada reemplazarase por unha incluída na versión actual que se está a utilizar no sistema.\n\nA recuperación será actualizada xunto cas actualizacións do sistema, para asegurar a compatibilidade coas versións futuras.\n\nQuere activar esta característica?</string>
+  <string name="update_recovery_off_warning">AVISO: Con esta característica desactivada, a recuperación instalada non se actualizará coas actualizaciónd so sistema.\n\nAs futuras actualizacións do sistema poderían non instalarse con versións de recuperación non actualizadas ou personalizadas.\n\nDe verdade desexa deactivar esta característica?</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB sobre a rede</string>
+  <string name="adb_over_network_summary">Activar a depuración TCP/IP sobre as interfaces de rede (Wi\u2011FI, redes USB). Esta configuración restabelecese ao reiniciar</string>
+  <string name="adb_over_network_disable_summary">Premer para desactivar a depuración TCP/IP sobre as interfaces de rede (Wi\u2011Fi, redes USB).</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">AVISO: Cando está habilitado ADB sobre red, o dispositivo está aberto a intrusións en tódalas redes conectadas.\n\nUtilice esta función tan só cando estea conectado a redes de confianza.\n\nDe verdade desexa activar esta función?</string>
   <!-- Home settings -->
+  <string name="system_reset_default_home">Restabelecer a pantalla de inicio predefinida</string>
+  <string name="system_home_settings">Configuración da pantalla de inicio</string>
+  <string name="reset_launcher_title">Restabelecer a pantalla de inicio predefinida</string>
+  <string name="reset_launcher_description">Ao restabelecer a pantalla de inicio, poderá escoller unha pantalla de inicio alternativa (i.e Trebuchet).\n\nQuere restablecer a pantalla de inicio predefinida?</string>
+  <string name="reset_launcher_tip">Premer no botón de inicio para amosar o diálogo de selección da pantalla de inicio.</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <string name="enable_terminal_title">Terminal local</string>
+  <string name="enable_terminal_summary">Activar o terminal</string>
+  <string name="disable_terminal_summary">Desactivar o terminal</string>
   <string name="enable_terminal_on">Activado</string>
   <string name="enable_terminal_off">Desactivado</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">Reinicio avanzado</string>
+  <string name="advanced_reboot_summary">Incluir opcións no menú para reiniciar en modo recuperación, cargador de arranque ou realizar un reinicio do sistema,</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reiniciar</string>
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recuperación</string>
   <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">Cargador de arranque</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">Reinicio do sistema</string>
   <!-- Display settings -->
   <string name="system_display">Pantalla</string>
+  <string name="system_display_overscan">Imaxe centrada</string>
+  <string name="system_display_overscan_description">Calibrar a pantalla para axustala ao tamaño da pantalla.</string>
 </resources>
diff --git a/Settings/res/values-hr/cm_strings.xml b/Settings/res/values-hr/cm_strings.xml
index 6fb9ad41..602fb4ab 100644
--- a/Settings/res/values-hr/cm_strings.xml
+++ b/Settings/res/values-hr/cm_strings.xml
@@ -67,9 +67,9 @@
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">UPOZORENJE: Kada je omogućen ADB preko mreže, vaš TV je otvoren za upad na svim povezanim mrežama!\n\nKoristite ovu funkciju samo kada ste povezani s pouzdanim mrežama.\n\nDa li zaista želite omogućiti ovu značajku?</string>
   <!-- Home settings -->
-  <string name="system_reset_default_home">Resetiraj zadani početni zaslon</string>
+  <string name="system_reset_default_home">Ponovno postavi zadani početni zaslon</string>
   <string name="system_home_settings">Home postavke</string>
-  <string name="reset_launcher_title">Resetiraj zadani početni zaslon</string>
+  <string name="reset_launcher_title">Ponovno postavi zadani početni zaslon</string>
   <string name="reset_launcher_description">Resetiranjem zadanog početnog zaslona možeš izabrati rezervni početni zaslon (i.e Trebuchet).\n\nŽelite li resetirati zadani početni zaslon?</string>
   <string name="reset_launcher_tip">Pritisni Home gumb za izbor početnog zaslona.</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
diff --git a/Settings/res/values-in/cm_strings.xml b/Settings/res/values-in/cm_strings.xml
index cdacfe2f..691a0125 100644
--- a/Settings/res/values-in/cm_strings.xml
+++ b/Settings/res/values-in/cm_strings.xml
@@ -29,7 +29,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">Anda telah mengaktifkan opsi pengembang!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-  <string name="show_dev_already_cm">Tidak perlu, Anda telah mengaktifkan mengaktifkan opsi pengembang.</string>
+  <string name="show_dev_already_cm">Tidak perlu, Anda telah mengaktifkan opsi pengembang.</string>
   <!-- About screen, build date -->
   <string name="about_build_date">Tanggal pembuatan</string>
   <!-- About screen, kernel version -->
@@ -39,15 +39,15 @@
   <!-- 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">Dinonaktifkan</string>
-  <string name="selinux_status_permissive">Permisif</string>
-  <string name="selinux_status_enforcing">Memaksa</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">Untuk mulai menggunakan CyanogenMod pastikan perangkat Bluetooth Anda sedang dalam modus bersanding. Untuk Nexus Remote dapat dilakukan dengan menekan tombol kembali dan beranda secara serentak.</string>
   <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Setting title for root access -->
-  <string name="root_access">Akses punca (root)</string>
-  <string name="root_access_warning_title">Izinkan akses punca (root)?</string>
-  <string name="root_access_warning_message">Mengizinkan aplikasi untuk meminta akses punca (root) sangat berbahaya dan dapat membahayakan keamanan sistem Anda!</string>
+  <string name="root_access">Akses root</string>
+  <string name="root_access_warning_title">Izinkan akses root?</string>
+  <string name="root_access_warning_message">Mengizinkan aplikasi untuk meminta akses root sangat berbahaya dan dapat membahayakan keamanan sistem Anda!</string>
   <string name="root_access_none">Dinonaktifkan</string>
   <string name="root_access_apps">Aplikasi saja</string>
   <string name="root_access_adb">ADB saja</string>
@@ -60,15 +60,15 @@
   <string name="update_recovery_off_warning">PERINGATAN: Jika fitur ini dinonaktifkan, pemulihan yang terinstal tidak akan diperbarui dengan peningkatan OS.\n\nPembaruan OS mendatang mungkin tidak dapat diinstal dengan versi pemulihan khusus atau versi pemulihan yang sudah usang.\n\nApakah Anda benar-benar ingin menonaktifkan fitur ini?</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ADB melalui jaringan</string>
-  <string name="adb_over_network_summary">Aktifkan perbaikan galat fungsi TCP/IP melalui antarmuka jaringan (Wi\u2011Fi, jaringan USB). Pengaturan ini diatur ulang pada saat dibut kembali</string>
-  <string name="adb_over_network_disable_summary">Klik untuk menonaktifkan perbaikan galat fungsi TCP/IP melalui antarmuka jaringan (Wi\u2011Fi, jaringan USB).</string>
+  <string name="adb_over_network_summary">Aktifkan TCP/IP debug melalui antarmuka jaringan (Wi-Fi, jaringan USB). Pengaturan ini dikembalikan standar saat dihidupkan ulang</string>
+  <string name="adb_over_network_disable_summary">Klik untuk menonaktifkan TCP/IP debugging melalui antarmuka jaringan (Wi\u2011Fi, jaringan USB).</string>
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">PERINGATAN: Ketika ADB melalui jaringan diaktifkan, TV Anda terbuka terhadap intrusi pada semua jaringan yang terhubung!\n\nHanya gunakan fitur ini ketika Anda terhubung pada jaringan tepercaya\n\nApakah Anda benar-benar ingin mengaktifkan fungsi ini?</string>
   <!-- Home settings -->
-  <string name="system_reset_default_home">Atur ulang layar beranda baku</string>
+  <string name="system_reset_default_home">Atur ulang layar beranda ke standar</string>
   <string name="system_home_settings">Pengaturan beranda</string>
-  <string name="reset_launcher_title">Atur ulang layar beranda baku</string>
-  <string name="reset_launcher_description">Dengan mengatur ulang layar beranda baku, Anda akan dapat memilih layar beranda alternatif (contohnya Trebuchet).\n\nApakah Anda ingin mengatur ulang layar beranda?</string>
+  <string name="reset_launcher_title">Atur ulang layar beranda ke standar</string>
+  <string name="reset_launcher_description">Dengan mengatur ulang layar beranda ke standar, anda akan dapat memilih layar beranda alternatif (contohnya Trebuchet).\n\nApakah anda ingin mengatur ulang layar beranda?</string>
   <string name="reset_launcher_tip">Tekan tombol beranda untuk memunculkan dialog pemilihan layar beranda.</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
   <string name="enable_terminal_title">Terminal lokal</string>
@@ -77,17 +77,17 @@
   <string name="enable_terminal_on">Diaktifkan</string>
   <string name="enable_terminal_off">Dinonaktifkan</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">But ulang lanjutan</string>
-  <string name="advanced_reboot_summary">Masukkan opsi di bagian menu Tentang untuk but ulang ke pemulihan, pengelola but, atau melakukan but ulang tanpa mati daya</string>
+  <string name="advanced_reboot_title">Mulai ulang lanjutan</string>
+  <string name="advanced_reboot_summary">Termasuk pilihan di sekitar menu untuk memulai ulang ke recovery, bootloader atau mulai ulang cepat</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device, within the Reboot Options dialog -->
-  <string name="reboot_reboot">But ulang</string>
+  <string name="reboot_reboot">Mulai ulang</string>
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
-  <string name="reboot_recovery">Pemulihan</string>
+  <string name="reboot_recovery">Recovery</string>
   <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
-  <string name="reboot_bootloader">Pengelola but</string>
+  <string name="reboot_bootloader">Bootloader</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
-  <string name="reboot_soft">But ulang tanpa mati daya</string>
+  <string name="reboot_soft">Mulai ulang cepat</string>
   <!-- Display settings -->
   <string name="system_display">Tampilan</string>
   <string name="system_display_overscan">Overscan</string>
diff --git a/Settings/res/values-ja/cm_strings.xml b/Settings/res/values-ja/cm_strings.xml
index 0a771dd0..43526d90 100644
--- a/Settings/res/values-ja/cm_strings.xml
+++ b/Settings/res/values-ja/cm_strings.xml
@@ -77,7 +77,7 @@
   <string name="enable_terminal_on">有効</string>
   <string name="enable_terminal_off">無効</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">高度な再起動</string>
+  <string name="advanced_reboot_title">再起動のオプション</string>
   <string name="advanced_reboot_summary">リカバリーまたはブートローダへの再起動や、ソフトリブートを実行するオプションを情報のメニューに含める</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device, within the Reboot Options dialog -->
diff --git a/Settings/res/values-nb/cm_strings.xml b/Settings/res/values-nb/cm_strings.xml
index d1031a99..d37fd295 100644
--- a/Settings/res/values-nb/cm_strings.xml
+++ b/Settings/res/values-nb/cm_strings.xml
@@ -32,7 +32,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already_cm">Ikke nødvendig, du allerede har aktivert utviklingsinnstillinger.</string>
   <!-- About screen, build date -->
-  <string name="about_build_date">Bygge dato</string>
+  <string name="about_build_date">Build-dato</string>
   <!-- About screen, kernel version -->
   <string name="about_kernel_version">Kernel versjon</string>
   <!-- About screen, SELinux status -->
diff --git a/Settings/res/values-nl/cm_strings.xml b/Settings/res/values-nl/cm_strings.xml
index 6a0bf2f9..42b40f24 100644
--- a/Settings/res/values-nl/cm_strings.xml
+++ b/Settings/res/values-nl/cm_strings.xml
@@ -28,9 +28,9 @@
     <item quantity="other">U bent nog <xliff:g id="step_count">%1$d</xliff:g> stappen verwijderd van de opties voor ontwikkelaars.</item>
   </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
-  <string name="show_dev_on_cm">U heeft de opties voor ontwikkelaars ingeschakeld!</string>
+  <string name="show_dev_on_cm">U hebt de opties voor ontwikkelaars ingeschakeld!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-  <string name="show_dev_already_cm">Niet nodig, u heeft de opties voor ontwikkelaars al ingeschakeld.</string>
+  <string name="show_dev_already_cm">Niet nodig, u hebt de opties voor ontwikkelaars al ingeschakeld.</string>
   <!-- About screen, build date -->
   <string name="about_build_date">Build-datum</string>
   <!-- About screen, kernel version -->
diff --git a/Settings/res/values-pl/cm_strings.xml b/Settings/res/values-pl/cm_strings.xml
index 490052dc..f4f066aa 100644
--- a/Settings/res/values-pl/cm_strings.xml
+++ b/Settings/res/values-pl/cm_strings.xml
@@ -50,7 +50,7 @@
   <string name="root_access">Dostęp do roota</string>
   <string name="root_access_warning_title">Przyznać dostęp do roota?</string>
   <string name="root_access_warning_message">Przyznanie aplikacjom dostępu do uprawień roota jest niebezpieczne i może zagrozić bezpieczeństwu systemu!</string>
-  <string name="root_access_none">Wyłączony</string>
+  <string name="root_access_none">Wyłączone</string>
   <string name="root_access_apps">Tylko aplikacje</string>
   <string name="root_access_adb">Tylko ADB</string>
   <string name="root_access_all">Aplikacje i ADB</string>
diff --git a/Settings/res/values-pt-rPT/cm_strings.xml b/Settings/res/values-pt-rPT/cm_strings.xml
index 0bfe9e20..3ad5335f 100644
--- a/Settings/res/values-pt-rPT/cm_strings.xml
+++ b/Settings/res/values-pt-rPT/cm_strings.xml
@@ -43,7 +43,7 @@
   <string name="selinux_status_permissive">Permissivo</string>
   <string name="selinux_status_enforcing">Forçar</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
-  <string name="accessories_add_bluetooth_inst_cm">Para começar a utilizar a CyanogenMod, certifique-se de que o bluetooth do seu dispositivo está no modo de emparelhamento. Para o Nexus Remote isto é feito ao pressionar o botão Voltar e Home simultaneamente.</string>
+  <string name="accessories_add_bluetooth_inst_cm">Para começar a utilizar a CyanogenMod, certifique-se de que o bluetooth do seu dispositivo está no modo de emparelhamento. Para o Nexus Remote isto é feito ao pressionar o botão Anterior e Página Inicial simultaneamente.</string>
   <!-- Title for Set CM in System Settings Developer options [CHAR LIMIT=50] -->
   <!-- Setting title for root access -->
   <string name="root_access">Acesso root</string>
@@ -70,7 +70,7 @@
   <string name="system_home_settings">Definições do ecrã inicial</string>
   <string name="reset_launcher_title">Redefinir o ecrã inicial padrão</string>
   <string name="reset_launcher_description">Ao redefir o ecrã inicial padrão, será capaz de escolher um ecrã inicial alternativo (exemplo: Trebuchet).\n\nQuer redefinir o ecrã inicial padrão?</string>
-  <string name="reset_launcher_tip">Pressione o botão Home para abrir a janela de seleção do ecrã inicial.</string>
+  <string name="reset_launcher_tip">Pressione o botão Página Inicial para abrir a janela de seleção do ecrã inicial.</string>
   <!-- Setting that enables the terminal app. [CHAR LIMIT=32] -->
   <string name="enable_terminal_title">Terminal local</string>
   <string name="enable_terminal_summary">Ativar a aplicação do terminal</string>