Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0HEADreplicant-6.0-0001replicant-6.0

12 files changed, 222 insertions, 97 deletions

diff --git a/packages/SettingsLib/res/values-ast-rES/arrays.xml b/packages/SettingsLib/res/values-ast-rES/arrays.xml
index 1d95ab1..7fe82ef 100644
--- a/packages/SettingsLib/res/values-ast-rES/arrays.xml
+++ b/packages/SettingsLib/res/values-ast-rES/arrays.xml
@@ -26,27 +26,27 @@
     <!-- Status message of Wi-Fi when it is idle. -->
     <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
-    <item>Esplorando\u2026</item>
+    <item>Escaniando\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
     <item>Coneutando\u2026</item>
     <!-- Status message of Wi-Fi when it is authenticating. -->
     <item>Autenticando\u2026</item>
     <!-- Status message of Wi-Fi when it is obtaining IP address. -->
-    <item>Obteniendo la direición IP\u2026</item>
+    <item>Consiguiendo direición IP\u2026</item>
     <!-- Status message of Wi-Fi when it is connected. -->
-    <item>Coneutáu</item>
+    <item>Connected</item>
     <!-- Status message of Wi-Fi when it is suspended. -->
-    <item>Suspendíu</item>
+    <item>Suspended</item>
     <!-- Status message of Wi-Fi when it is disconnecting. -->
     <item>Desconeutando\u2026</item>
     <!-- Status message of Wi-Fi when it is disconnected. -->
-    <item>Desconeutáu</item>
+    <item>Disconnected</item>
     <!-- Status message of Wi-Fi when it is a failure. -->
-    <item>Incorreutu</item>
+    <item>Unsuccessful</item>
     <!-- Status message of Wi-Fi when it is blocked. -->
-    <item>Bloquiada</item>
+    <item>Blocked</item>
     <!-- Status message of Wi-Fi when connectiong is being verified. -->
-    <item>Desactivando mala conexón temporalmente</item>
+    <item>Evitando temporalmente conexón probe</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
   <!-- Wi-Fi settings. The status messages when the network is known. -->
@@ -54,26 +54,26 @@
     <!-- Status message of Wi-Fi when it is idle. -->
     <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
-    <item>Esplorando\u2026</item>
+    <item>Escaniando\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
-    <item>Coneutando a <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <item>Connecting to <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is authenticating with a network. -->
     <item>Autenticando con <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is obtaining IP address from a network. -->
-    <item>Obteniendo direición IP de <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <item>Consiguiendo direición IP de <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is connected to a network. -->
-    <item>Coneutáu a <xliff:g id="network_name">%1$s</xliff:g></item>
+    <item>Connected to <xliff:g id="network_name">%1$s</xliff:g></item>
     <!-- Status message of Wi-Fi when it is suspended. -->
-    <item>Suspendíu</item>
+    <item>Suspended</item>
     <!-- Status message of Wi-Fi when it is disconnecting from a network. -->
-    <item>Desconeutando de <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <item>Disconnecting from <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is disconnected. -->
-    <item>Desconeutáu</item>
+    <item>Disconnected</item>
     <!-- Status message of Wi-Fi when it is a failure. -->
-    <item>Incorreutu</item>
+    <item>Unsuccessful</item>
     <!-- Status message of Wi-Fi when it is blocked. -->
-    <item>Bloquiada</item>
+    <item>Blocked</item>
     <!-- Status message of Wi-Fi when connectiong is being verified. -->
-    <item>Desactivando mala conexón  temporalmente</item>
+    <item>Temporarily avoiding poor connection</item>
   </string-array>
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/cm_strings.xml b/packages/SettingsLib/res/values-ast-rES/cm_strings.xml
index a91e12f..3735e24 100644
--- a/packages/SettingsLib/res/values-ast-rES/cm_strings.xml
+++ b/packages/SettingsLib/res/values-ast-rES/cm_strings.xml
@@ -21,7 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="profile_applist_title">Aplicaciones</string>
   <string name="picker_activities">Actividaes</string>
-  <string name="select_custom_app_title">Esbilla d\'app personalizada</string>
-  <string name="select_custom_activity_title">Esbilla d\'app personalizada</string>
+  <string name="select_custom_app_title">Esbillar aplicación personalizada</string>
+  <string name="select_custom_activity_title">Esbillar actividá personalizada</string>
   <string name="lockscreen_targets_message">Atayos de pantalla de bloquéu</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/strings.xml b/packages/SettingsLib/res/values-ast-rES/strings.xml
index f1a1f88..0866760 100644
--- a/packages/SettingsLib/res/values-ast-rES/strings.xml
+++ b/packages/SettingsLib/res/values-ast-rES/strings.xml
@@ -20,7 +20,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Toast message when Wi-Fi cannot scan for networks -->
-  <string name="wifi_fail_to_scan">Nun puen buscase redes</string>
+  <string name="wifi_fail_to_scan">Nun puen escaniase redes</string>
   <!-- Do not translate.  Concise terminology for wifi with WEP security -->
   <string name="wifi_security_short_wep">WEP</string>
   <!-- Do not translate.  Concise terminology for wifi with WPA security -->
@@ -34,7 +34,6 @@
   <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
   <string name="wifi_security_short_eap">802.1x</string>
   <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
-  <string name="wifi_security_none">Nenguna</string>
   <!-- Do not translate.  Terminology for wifi with WEP security -->
   <string name="wifi_security_wep">WEP</string>
   <!-- Do not translate.  Terminology for wifi with WPA security -->
@@ -48,166 +47,104 @@
   <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
   <string name="wifi_security_eap">802.1x EAP</string>
   <!-- Do not translate.  Concise terminology for Passpoint network -->
-  <string name="wifi_security_passpoint">Passpoint</string>
   <!-- Summary for the remembered network. -->
-  <string name="wifi_remembered">Guardada</string>
   <!-- Status for networks disabled for unknown reason -->
-  <string name="wifi_disabled_generic">Deshabilitada</string>
   <!-- Status for networked disabled from a DNS or DHCP failure -->
-  <string name="wifi_disabled_network_failure">Fallu de configuración IP</string>
   <!-- Status for networked disabled from a wifi association failure -->
-  <string name="wifi_disabled_wifi_failure">Fallu de conexón Wi-Fi</string>
   <!-- Status for networks disabled from authentication failure (wrong password
          or certificate). -->
-  <string name="wifi_disabled_password_failure">Problema d\'autenticación</string>
   <!-- Summary for the remembered network but currently not in range. -->
-  <string name="wifi_not_in_range">Fuera d\'algame</string>
   <!-- Summary for the remembered network but no internet connection was detected. -->
-  <string name="wifi_no_internet">Nun se deteutó l\'accesu a Internet. Nun va volver a coneutase de mou automáticu.</string>
   <!-- Summary for saved networks -->
-  <string name="saved_network">Guardada por <xliff:g id="name">%1$s</xliff:g></string>
   <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
-  <string name="connected_via_wfa">Coneutáu por asistente de Wi-Fi</string>
   <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
-  <string name="connected_via_passpoint">Conexón al traviés de %1$s</string>
   <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
-  <string name="available_via_passpoint">Disponible al traviés de %1$s</string>
+  <string name="available_via_passpoint">Disponible per %1$s</string>
   <!-- Package name for Settings app-->
   <!-- Package name for Certinstaller app-->
   <!-- Summary for Connected wifi network without internet -->
-  <string name="wifi_connected_no_internet">Conectáu, ensin Internet</string>
   <!-- Bluetooth settings.  Message when a device is disconnected -->
-  <string name="bluetooth_disconnected">Desconeutáu</string>
   <!-- Bluetooth settings.  Message when disconnecting from a device -->
   <string name="bluetooth_disconnecting">Desconeutando\u2026</string>
   <!-- Bluetooth settings.  Message when connecting to a device -->
   <string name="bluetooth_connecting">Coneutando\u2026</string>
   <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected">Coneutáu</string>
   <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
-  <string name="bluetooth_pairing">Enllazando\u2026</string>
+  <string name="bluetooth_pairing">Empareyando\u2026</string>
   <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected_no_headset">Coneutáu (ensin tfnu)</string>
   <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected_no_a2dp">Coneutáu (ensin multimedia)</string>
   <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected_no_map">Coneutáu (ensin accesu a mensaxes)</string>
   <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
-  <string name="bluetooth_connected_no_headset_no_a2dp">Coneutáu (ensin tel. nin multimedia)</string>
   <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
-  <string name="bluetooth_profile_a2dp">Audiu multimedia</string>
   <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
-  <string name="bluetooth_profile_headset">Audiu del preséu</string>
+  <string name="bluetooth_profile_headset">Audiu del teléfonu</string>
   <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
   <string name="bluetooth_profile_opp">Tresferencia de ficheros</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
   <string name="bluetooth_profile_hid">Preséu d\'entrada</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
-  <string name="bluetooth_profile_pan">Accesu a Internet</string>
+  <string name="bluetooth_profile_pan">Accesu a internet</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
-  <string name="bluetooth_profile_pbap">Compartir contautos</string>
   <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
-  <string name="bluetooth_profile_pbap_summary">Usar pa compartir contautos</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
-  <string name="bluetooth_profile_pan_nap">Compartir conexón d\'internet</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
   <string name="bluetooth_profile_map">Accesu a mensaxes</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
-  <string name="bluetooth_profile_sap">Accesu SIM</string>
   <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
-  <string name="bluetooth_profile_dun">Accesu telefónicu a redes</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
-  <string name="bluetooth_a2dp_profile_summary_connected">Conectáu al audiu multimedia</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
-  <string name="bluetooth_headset_profile_summary_connected">Conectáu al audiu del preséu</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
-  <string name="bluetooth_opp_profile_summary_connected">Coneutáu al sirvidor de tresferencia de ficheros</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
-  <string name="bluetooth_map_profile_summary_connected">Coneutáu a mapa</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
-  <string name="bluetooth_sap_profile_summary_connected">Coneutáu a SAP</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
-  <string name="bluetooth_opp_profile_summary_not_connected">Ensin conexón col sirvidor de tresferencia de ficheros</string>
   <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
-  <string name="bluetooth_hid_profile_summary_connected">Coneutáu a preséu d\'entrada</string>
   <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
-  <string name="bluetooth_pan_user_profile_summary_connected">Coneutáu a preséu p\'accesu a Internet</string>
   <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
-  <string name="bluetooth_pan_nap_profile_summary_connected">Compartiendo conexón a Internet col preséu</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
-  <string name="bluetooth_dun_profile_summary_connected">Coneutáu al sirvidor DUN</string>
   <!-- Bluetooth settings. Connection options screen. The summary
          for the PAN checkbox preference that describes how checking it
          will set the PAN profile as preferred. -->
-  <string name="bluetooth_pan_profile_summary_use_for">Usar p\'acceder a Internet</string>
   <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
-  <string name="bluetooth_map_profile_summary_use_for">Usar pa mapa</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
-  <string name="bluetooth_sap_profile_summary_use_for">Usar p\'accesu a SIM</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
-  <string name="bluetooth_a2dp_profile_summary_use_for">Usar p\'audiu de mediu</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
-  <string name="bluetooth_headset_profile_summary_use_for">Usar p\'audiu del teléfonu</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
-  <string name="bluetooth_opp_profile_summary_use_for">Usu de la tresferencia de ficheros</string>
   <!-- Bluetooth settings. Connection options screen. The summary
          for the HID checkbox preference that describes how checking it
          will set the HID profile as preferred. -->
-  <string name="bluetooth_hid_profile_summary_use_for">Usar pa entrada</string>
   <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
-  <string name="bluetooth_dun_profile_summary_use_for">Usáu pal accesu telefónicu a redes</string>
   <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
-  <string name="bluetooth_pairing_accept">Enllazar</string>
   <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
-  <string name="bluetooth_pairing_accept_all_caps">ENLLAZAR</string>
+  <string name="bluetooth_pairing_accept_all_caps">EMPAREYAR</string>
   <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
   <string name="bluetooth_pairing_decline">Encaboxar</string>
   <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
-  <string name="bluetooth_pairing_will_share_phonebook">La vinculación permite acceder a los contautos y al historial de llamaes cuando\'l preséu ta coneutáu.</string>
   <!-- Message for the error dialog when BT pairing fails generically. -->
-  <string name="bluetooth_pairing_error_message">Nun pudo enllazase con <xliff:g id="device_name">%1$s</xliff:g>.</string>
   <!-- Message for the error dialog when BT pairing fails because the PIN /
     Passkey entered is incorrect. -->
-  <string name="bluetooth_pairing_pin_error_message">Nun pudo enllazase con <xliff:g id="device_name">%1$s</xliff:g> porque la clave d\'accesu o el PIN son incorreutos.</string>
   <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
-  <string name="bluetooth_pairing_device_down_error_message">Nun pue afitase comunicación con <xliff:g id="device_name">%1$s</xliff:g>.</string>
   <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
-  <string name="bluetooth_pairing_rejected_error_message">Enllaz refugáu por <xliff:g id="device_name">%1$s</xliff:g></string>
   <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_off">Wi-Fi desactiváu</string>
   <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_no_wifi">Wi-Fi desconeutáu</string>
   <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_one_bar">Una barra de Wi-Fi</string>
   <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_two_bars">Dos barres de Wi-Fi</string>
   <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_three_bars">Trés barres de Wi-Fi</string>
   <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_wifi_signal_full">Señal de Wi-Fi al máximu</string>
   <!-- Label for kernel threads in battery usage -->
-  <string name="process_kernel_label">Android OS</string>
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
-  <string name="data_usage_uninstalled_apps">Aplicaciones desaniciaes</string>
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
-  <string name="data_usage_uninstalled_apps_users">Usuarios y aplicaciones desaniciaos</string>
   <!-- Tethering controls, item title to go into the tethering settings -->
   <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_usb">Anclaxe de USB</string>
   <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_wifi">Zona Wi-Fi portátil</string>
   <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_bluetooth">Anclaxe de Bluetooth</string>
   <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_usb_bluetooth">Anclaxe a rede</string>
+  <string name="tether_settings_title_usb_bluetooth">Tethering</string>
   <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
-  <string name="tether_settings_title_all">Anclaxe a rede y zona Wi-Fi</string>
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <string name="managed_user_title">Perfil de trabayu</string>
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <string name="user_guest">Convidáu</string>
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
-  <string name="unknown">Desconocíu</string>
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <string name="running_process_item_user_label">Usuariu: <xliff:g id="user_name">%1$s</xliff:g></string>
 </resources>
diff --git a/packages/SettingsLib/res/values-en-rAU/cm_strings.xml b/packages/SettingsLib/res/values-en-rAU/cm_strings.xml
index 220d5f5..b311b85 100644
--- a/packages/SettingsLib/res/values-en-rAU/cm_strings.xml
+++ b/packages/SettingsLib/res/values-en-rAU/cm_strings.xml
@@ -18,4 +18,10 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Apps</string>
+  <string name="picker_activities">Activities</string>
+  <string name="select_custom_app_title">Select custom app</string>
+  <string name="select_custom_activity_title">Select custom activity</string>
+  <string name="lockscreen_targets_message">Lock screen shortcuts</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rGB/cm_strings.xml b/packages/SettingsLib/res/values-en-rGB/cm_strings.xml
index 220d5f5..b311b85 100644
--- a/packages/SettingsLib/res/values-en-rGB/cm_strings.xml
+++ b/packages/SettingsLib/res/values-en-rGB/cm_strings.xml
@@ -18,4 +18,10 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Apps</string>
+  <string name="picker_activities">Activities</string>
+  <string name="select_custom_app_title">Select custom app</string>
+  <string name="select_custom_activity_title">Select custom activity</string>
+  <string name="lockscreen_targets_message">Lock screen shortcuts</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-hr/cm_strings.xml b/packages/SettingsLib/res/values-hr/cm_strings.xml
index dbf9958..3ea0fa7 100644
--- a/packages/SettingsLib/res/values-hr/cm_strings.xml
+++ b/packages/SettingsLib/res/values-hr/cm_strings.xml
@@ -21,7 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="profile_applist_title">Aplikacije</string>
   <string name="picker_activities">Aktivnosti</string>
-  <string name="select_custom_app_title">Odaberite aplikaciju</string>
-  <string name="select_custom_activity_title">Odaberite prilagođenu aktivnost</string>
+  <string name="select_custom_app_title">Odabir prilagođene aplikacije</string>
+  <string name="select_custom_activity_title">Odabir prilgođene aktivnosti</string>
   <string name="lockscreen_targets_message">Prečaci zaključanog zaslona</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-it/cm_strings.xml b/packages/SettingsLib/res/values-it/cm_strings.xml
index ff906e5..d2a4b2c 100644
--- a/packages/SettingsLib/res/values-it/cm_strings.xml
+++ b/packages/SettingsLib/res/values-it/cm_strings.xml
@@ -23,5 +23,5 @@
   <string name="picker_activities">Attività</string>
   <string name="select_custom_app_title">Seleziona app personalizzata</string>
   <string name="select_custom_activity_title">Seleziona attività personalizzata</string>
-  <string name="lockscreen_targets_message">Scorciatoie del blocco schermo</string>
+  <string name="lockscreen_targets_message">Scorciatoie blocco schermo</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-ko/cm_strings.xml b/packages/SettingsLib/res/values-ko/cm_strings.xml
index 9669798..6a0df78 100644
--- a/packages/SettingsLib/res/values-ko/cm_strings.xml
+++ b/packages/SettingsLib/res/values-ko/cm_strings.xml
@@ -19,7 +19,7 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="profile_applist_title">애플리케이션</string>
+  <string name="profile_applist_title">앱</string>
   <string name="picker_activities">액티비티</string>
   <string name="select_custom_app_title">사용자 정의 앱 선택</string>
   <string name="select_custom_activity_title">사용자 정의 액티비티 선택</string>
diff --git a/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml b/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
index 220d5f5..f4b4958 100644
--- a/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
+++ b/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
@@ -18,4 +18,10 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikacionet</string>
+  <string name="picker_activities">Aktivitete</string>
+  <string name="select_custom_app_title">Zgjidh një aplikacion të personalizuar</string>
+  <string name="select_custom_activity_title">Zgjidh një aktivitet të personalizuar</string>
+  <string name="lockscreen_targets_message">Shkurtoret e ekranit bllokues</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sr-rCS/arrays.xml b/packages/SettingsLib/res/values-sr-rCS/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-sr-rCS/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-sr-rCS/cm_strings.xml b/packages/SettingsLib/res/values-sr-rCS/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-sr-rCS/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 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"></resources>
diff --git a/packages/SettingsLib/res/values-sr-rCS/strings.xml b/packages/SettingsLib/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-sr-rCS/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- 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 -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>