From cb323c7ee808d49d5e78aa05a35a743ea7ab71f0 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Sun, 19 Feb 2017 19:34:56 -0800
Subject: Automatic translation import

Change-Id: I80e32cc003cc9c8707732b27a683e87cdd67375d
---
 .../res/values-sr-rCS/strings.xml                  |  38 ++
 .../res/values-sr-rCS/strings.xml                  |   3 +
 .../res/values-sr-rCS/strings.xml                  |  23 ++
 packages/DocumentsUI/res/values-sr-rCS/strings.xml |  67 +++
 .../res/values-sr-rCS/strings.xml                  |  21 +
 .../FusedLocation/res/values-sr-rCS/strings.xml    |   5 +
 .../InputDevices/res/values-sr-rCS/strings.xml     |  43 ++
 packages/Keyguard/res/values-da/cm_strings.xml     |   4 +
 packages/Keyguard/res/values-en-rGB/cm_strings.xml |   7 +
 packages/Keyguard/res/values-hr/cm_strings.xml     |   8 +-
 packages/Keyguard/res/values-sr-rCS/cm_strings.xml |  23 ++
 packages/Keyguard/res/values-sr-rCS/strings.xml    | 142 +++++++
 packages/Keyguard/res/values-uk/cm_strings.xml     |   1 +
 .../PrintSpooler/res/values-sr-rCS/strings.xml     |  93 +++++
 .../SettingsLib/res/values-en-rGB/cm_strings.xml   |   8 +-
 packages/SettingsLib/res/values-hr/cm_strings.xml  |   4 +-
 packages/SettingsLib/res/values-it/cm_strings.xml  |   2 +-
 packages/SettingsLib/res/values-sr-rCS/arrays.xml  |  27 ++
 .../SettingsLib/res/values-sr-rCS/cm_strings.xml   |  21 +
 packages/SettingsLib/res/values-sr-rCS/strings.xml | 122 ++++++
 .../SettingsProvider/res/values-sr-rCS/strings.xml |  22 +
 packages/Shell/res/values-sr-rCS/strings.xml       |  24 ++
 .../StatementService/res/values-sr-rCS/strings.xml |  17 +
 packages/SystemUI/res/values-en-rGB/cm_arrays.xml  |  18 +
 packages/SystemUI/res/values-en-rGB/cm_strings.xml | 129 ++++++
 packages/SystemUI/res/values-es-rUS/cm_strings.xml |   8 +-
 packages/SystemUI/res/values-hr/cm_strings.xml     |  98 ++---
 packages/SystemUI/res/values-in/cm_strings.xml     |  13 +-
 packages/SystemUI/res/values-sr-rCS/cm_arrays.xml  |  23 ++
 packages/SystemUI/res/values-sr-rCS/cm_strings.xml |  96 +++++
 packages/SystemUI/res/values-sr-rCS/strings.xml    | 459 +++++++++++++++++++++
 packages/SystemUI/res/values-uk/cm_strings.xml     |  20 +
 packages/SystemUI/res/values-vi/cm_strings.xml     |   5 +
 packages/SystemUI/res/values-zh-rTW/cm_strings.xml |   2 +-
 packages/VpnDialogs/res/values-sr-rCS/strings.xml  |  28 ++
 .../WallpaperCropper/res/values-sr-rCS/strings.xml |  23 ++
 36 files changed, 1579 insertions(+), 68 deletions(-)
 create mode 100644 packages/BackupRestoreConfirmation/res/values-sr-rCS/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-sr-rCS/strings.xml
 create mode 100644 packages/DefaultContainerService/res/values-sr-rCS/strings.xml
 create mode 100644 packages/DocumentsUI/res/values-sr-rCS/strings.xml
 create mode 100644 packages/ExternalStorageProvider/res/values-sr-rCS/strings.xml
 create mode 100644 packages/FusedLocation/res/values-sr-rCS/strings.xml
 create mode 100644 packages/InputDevices/res/values-sr-rCS/strings.xml
 create mode 100644 packages/Keyguard/res/values-sr-rCS/cm_strings.xml
 create mode 100644 packages/Keyguard/res/values-sr-rCS/strings.xml
 create mode 100644 packages/PrintSpooler/res/values-sr-rCS/strings.xml
 create mode 100644 packages/SettingsLib/res/values-sr-rCS/arrays.xml
 create mode 100644 packages/SettingsLib/res/values-sr-rCS/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-sr-rCS/strings.xml
 create mode 100644 packages/SettingsProvider/res/values-sr-rCS/strings.xml
 create mode 100644 packages/Shell/res/values-sr-rCS/strings.xml
 create mode 100644 packages/StatementService/res/values-sr-rCS/strings.xml
 create mode 100644 packages/SystemUI/res/values-sr-rCS/cm_arrays.xml
 create mode 100644 packages/SystemUI/res/values-sr-rCS/cm_strings.xml
 create mode 100644 packages/SystemUI/res/values-sr-rCS/strings.xml
 create mode 100644 packages/VpnDialogs/res/values-sr-rCS/strings.xml
 create mode 100644 packages/WallpaperCropper/res/values-sr-rCS/strings.xml

(limited to 'packages')

diff --git a/packages/BackupRestoreConfirmation/res/values-sr-rCS/strings.xml b/packages/BackupRestoreConfirmation/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-sr-rCS/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/CaptivePortalLogin/res/values-sr-rCS/strings.xml b/packages/CaptivePortalLogin/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-sr-rCS/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/DefaultContainerService/res/values-sr-rCS/strings.xml b/packages/DefaultContainerService/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-sr-rCS/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-sr-rCS/strings.xml b/packages/DocumentsUI/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-sr-rCS/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-sr-rCS/strings.xml b/packages/ExternalStorageProvider/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-sr-rCS/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-sr-rCS/strings.xml b/packages/FusedLocation/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-sr-rCS/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-sr-rCS/strings.xml b/packages/InputDevices/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-sr-rCS/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/Keyguard/res/values-da/cm_strings.xml b/packages/Keyguard/res/values-da/cm_strings.xml
index 9fd131c..5841d04 100644
--- a/packages/Keyguard/res/values-da/cm_strings.xml
+++ b/packages/Keyguard/res/values-da/cm_strings.xml
@@ -21,6 +21,10 @@
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Ugyldigt SIM-kort.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Angiv SIM-pinkode, du har <xliff:g id="number">%d</xliff:g> forsøg tilbage, før du må kontakte din udbyder for at låse enheden op.</item>
+    <item quantity="other">Angiv SIM-pinkode, du har <xliff:g id="number">%d</xliff:g> forsøg tilbage.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Fejl: Input er kortere end minimumslængden</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rGB/cm_strings.xml b/packages/Keyguard/res/values-en-rGB/cm_strings.xml
index 0ba09aa..d17273a 100644
--- a/packages/Keyguard/res/values-en-rGB/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rGB/cm_strings.xml
@@ -17,7 +17,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM card is Perso locked</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">Invalid card.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your network operator to unlock your device.</item>
+    <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hr/cm_strings.xml b/packages/Keyguard/res/values-hr/cm_strings.xml
index 0ccbe4f..96f38d2 100644
--- a/packages/Keyguard/res/values-hr/cm_strings.xml
+++ b/packages/Keyguard/res/values-hr/cm_strings.xml
@@ -22,10 +22,10 @@
   <string name="lockscreen_sim_error_message_short">Kartica nije valjana.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Upišite SIM PIN, preostao vam je <xliff:g id="number">%d</xliff:g> pokušaj nakon čega ćete morati kontaktirati svog pružatelja usluga da otključa vaš uređaj.</item>
-    <item quantity="few">Upišite SIM PIN, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
-    <item quantity="other">Upišite SIM PIN, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
+    <item quantity="one">Upišite PIN za SIM, preostao vam je <xliff:g id="number">%d</xliff:g> pokušaj nakon čega ćete morati kontaktirati svog pružatelja usluga da otključa vaš uređaj.</item>
+    <item quantity="few">Upišite PIN za SIM, preostala su vam <xliff:g id="number">%d</xliff:g> pokušaja.</item>
+    <item quantity="other">Upišite PIN za SIM, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
   </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Pogreška: Ulaz je kraći od minimalne potrebne duljine</string>
+  <string name="kg_invalid_sim_length">Pogreška: ulazna vrijednost je kraćia od minimalne potrebne duljine</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sr-rCS/cm_strings.xml b/packages/Keyguard/res/values-sr-rCS/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-sr-rCS/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-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">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-sr-rCS/strings.xml b/packages/Keyguard/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-sr-rCS/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-uk/cm_strings.xml b/packages/Keyguard/res/values-uk/cm_strings.xml
index 084c45b..063a1c2 100644
--- a/packages/Keyguard/res/values-uk/cm_strings.xml
+++ b/packages/Keyguard/res/values-uk/cm_strings.xml
@@ -27,4 +27,5 @@
     <item quantity="other">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроб перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
   </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Помилка: введено меньше мінімальної довжини</string>
 </resources>
diff --git a/packages/PrintSpooler/res/values-sr-rCS/strings.xml b/packages/PrintSpooler/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-sr-rCS/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</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-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>
diff --git a/packages/SettingsProvider/res/values-sr-rCS/strings.xml b/packages/SettingsProvider/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-sr-rCS/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/Shell/res/values-sr-rCS/strings.xml b/packages/Shell/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-sr-rCS/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/StatementService/res/values-sr-rCS/strings.xml b/packages/StatementService/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-sr-rCS/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 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"></resources>
diff --git a/packages/SystemUI/res/values-en-rGB/cm_arrays.xml b/packages/SystemUI/res/values-en-rGB/cm_arrays.xml
index 44e4c6a..3110756 100644
--- a/packages/SystemUI/res/values-en-rGB/cm_arrays.xml
+++ b/packages/SystemUI/res/values-en-rGB/cm_arrays.xml
@@ -17,6 +17,24 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>N</item>
+    <!-- North -->
+    <item>NE</item>
+    <!-- North east -->
+    <item>E</item>
+    <!-- East -->
+    <item>SE</item>
+    <!-- South east -->
+    <item>S</item>
+    <!-- South -->
+    <item>SW</item>
+    <!-- South west -->
+    <item>W</item>
+    <!-- West -->
+    <item>NW</item>
+    <!-- North west -->
+  </string-array>
   <!-- Performance profiles description-->
   <!-- Performance profiles announcement-->
   <!-- Dynamic tiles -->
diff --git a/packages/SystemUI/res/values-en-rGB/cm_strings.xml b/packages/SystemUI/res/values-en-rGB/cm_strings.xml
index 4b3b506..d7e892c 100644
--- a/packages/SystemUI/res/values-en-rGB/cm_strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/cm_strings.xml
@@ -17,81 +17,210 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
   <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
   <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <!-- Text to use when the number in a notification info is too large
          (greater than status_bar_notification_info_maxnum, defined in
          values/config.xml) and must be truncated.
          [CHAR LIMIT=4] -->
   <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">Swipe right for %1$s</string>
+  <string name="right_shortcut_hint">Swipe left for %1$s</string>
+  <string name="lockscreen_message">Tap an icon on the left or right to reassign a lock screen shortcut.</string>
+  <string name="lockscreen_default_target">Default</string>
+  <string name="select_application">Select application</string>
+  <string name="lockscreen_choose_action_title">Choose action</string>
+  <string name="lockscreen_none_target">None</string>
   <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">Choose action to assign</string>
+  <string name="navbar_home_button">Home button</string>
+  <string name="navbar_recent_button">Recent button</string>
+  <string name="navbar_search_button">Search button</string>
+  <string name="navbar_back_button">Back button</string>
+  <string name="navbar_empty_button">Empty button</string>
+  <string name="navbar_menu_conditional_button">Menu (autoHide) button</string>
+  <string name="navbar_menu_always_button">Menu (alwaysShow) button</string>
+  <string name="navbar_menu_big_button">Menu button</string>
+  <string name="accessibility_dpad_left">Cursor left</string>
+  <string name="accessibility_dpad_right">Cursor right</string>
   <!-- Development shortcuts -->
   <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">Wipe app data</string>
   <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">Force stop</string>
   <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">Uninstall</string>
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Light brightness</string>
   <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">Profiles off.</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">Profile: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">Profiles turned off.</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">Profile changed to <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <string name="quick_settings_compass_init">Initialising\u2026</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Light settings</string>
+  <string name="led_notification_text">LED enabled by settings</string>
+  <string name="qs_tile_edit_header_instruction">Press and hold tiles to rearrange</string>
+  <string name="quick_settings_edit_label">Edit tiles</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Cannot delete the Edit tile</string>
+  <string name="qs_tiles_reset_confirmation">Reset quick settings tiles to default configuration?</string>
+  <string name="quick_settings_tile_reset_to_default">Reset to default layout</string>
+  <string name="quick_settings_title_header">Header</string>
+  <string name="quick_settings_title_tiles">Tiles</string>
+  <string name="quick_settings_title_show_weather">Show weather</string>
+  <string name="quick_settings_title_show_brightness_slider">Show brightness slider</string>
+  <string name="quick_settings_title_enlarge_first_row">Enlarge first row</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch and hold the Back button to unpin.</string>
+  <string name="quick_settings_custom_tile_detail_title">Custom tile</string>
+  <string name="quick_settings_remove">Remove tile</string>
+  <string name="quick_settings_network_adb_label">ADB over network</string>
+  <string name="quick_settings_compass_label">Compass</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">System profiles</string>
+  <string name="quick_settings_profiles_off">Profiles disabled</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">Battery saver</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Battery saver (charging)</string>
+  <string name="quick_settings_caffeine_label">Caffeine</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">Sync off.</string>
   <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">Sync on.</string>
   <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">Sync turned off.</string>
   <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">Sync turned on.</string>
+  <string name="quick_settings_sync_label">Sync</string>
+  <string name="quick_settings_volume_panel_label">Volume panel</string>
+  <string name="quick_settings_usb_tether_label">USB tethering</string>
+  <string name="quick_settings_screen_timeout_detail_title">Screen timeout</string>
+  <string name="quick_settings_lockscreen_label">Lock screen</string>
+  <string name="quick_settings_ambient_display_label">Ambient display</string>
+  <string name="quick_settings_lockscreen_label_enforced">Lock screen enforced</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Disabled by profile</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">Screen timeout: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">Screen timeout changed to <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <string name="qs_tile_performance">Battery mode</string>
   <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">Battery mode: power save mode.</string>
   <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">Battery mode: balanced mode.</string>
   <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">Battery mode: performance mode.</string>
   <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Battery mode: efficiency mode.</string>
   <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">Battery mode: quick mode.</string>
   <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Battery mode changed to power save mode.</string>
   <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">Battery mode changed to balanced mode.</string>
   <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">Battery mode changed to performance mode.</string>
   <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Battery mode changed to efficiency mode.</string>
   <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Battery mode changed to quick mode.</string>
+  <string name="quick_settings_performance_profile_detail_title">Battery mode</string>
   <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">Lock screen off.</string>
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">Lock screen on.</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">Lock screen turned off.</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Lock screen turned on.</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">Ambient display off.</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">Ambient display on.</string>
   <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display turned off.</string>
   <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display turned on.</string>
   <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Heads up off.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Heads up on.</string>
   <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up turned off.</string>
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up turned on.</string>
   <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Caffeine off.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Caffeine on.</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">Battery saver off.</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">Battery saver on.</string>
   <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Battery saver turned off.</string>
   <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Battery saver turned on.</string>
   <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">Dynamic tile</string>
+  <string name="dynamic_qs_tile_next_alarm_label">Next alarm</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME selector</string>
+  <string name="dynamic_qs_tile_su_label">Root access</string>
+  <string name="dynamic_qs_tile_themes_label">Themes</string>
+  <string name="quick_settings_title_advanced_location">Tri-state location</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">Location reporting: battery saving mode.</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">Location reporting: sensors only mode.</string>
   <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">Location reporting: high accuracy mode.</string>
   <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">Location mode</string>
   <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">Battery saving</string>
   <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">Device only</string>
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">High accuracy</string>
   <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">Location reporting changed to battery saving mode.</string>
   <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">Location reporting changed to sensors only mode.</string>
   <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">Location reporting changed to high accuracy mode.</string>
+  <string name="quick_settings_tiles_category_system">System tiles</string>
   <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Add a tile</string>
   <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Unable to connect to mobile networks while Airplane mode is enabled. Disable Airplane mode and try again.</string>
   <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Torch is on</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Tap to turn off</string>
   <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d clients</item>
+  </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">No data SIM</string>
   <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dock battery <xliff:g id="number">%d</xliff:g> percent.</string>
   <!-- Play queue -->
+  <string name="play_queue_extention">Show play queue</string>
   <!-- Path data for portrait battery -->
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Swipe down to expand</string>
+  <string name="swipe_left_hint">Swipe left to <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Swipe right to notifications</string>
 </resources>
diff --git a/packages/SystemUI/res/values-es-rUS/cm_strings.xml b/packages/SystemUI/res/values-es-rUS/cm_strings.xml
index 43f3f98..1ce7517 100644
--- a/packages/SystemUI/res/values-es-rUS/cm_strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/cm_strings.xml
@@ -67,7 +67,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ajustes de luz de notificación</string>
   <string name="led_notification_text">Luz LED activada por ajustes</string>
-  <string name="qs_tile_edit_header_instruction">Tocar y dejar presionados los mosaicos para reorganizarlos</string>
+  <string name="qs_tile_edit_header_instruction">Pulsa y mantén presionados los mosaicos para reorganizarlos</string>
   <string name="quick_settings_edit_label">Editar mosaicos</string>
   <string name="quick_settings_cannot_delete_edit_tile">No se puede eliminar el mosaico Editar</string>
   <string name="qs_tiles_reset_confirmation">¿Restaurar lo mosaicos de ajustes rápidos a su configuración predeterminada?</string>
@@ -106,7 +106,7 @@
   <string name="quick_settings_lockscreen_label">Pantalla bloqueada</string>
   <string name="quick_settings_ambient_display_label">Pantalla ambiente</string>
   <string name="quick_settings_lockscreen_label_enforced">Pantalla bloqueada forzada</string>
-  <string name="quick_settings_lockscreen_label_locked_by_profile">Deshabilitado por perfil</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Desactivado por perfil</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Tiempo de espera de pantalla: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -158,9 +158,9 @@
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Notificaciones emergentes activadas.</string>
   <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_caffeine_off">Deshabilitar cafeína.</string>
+  <string name="accessibility_quick_settings_caffeine_off">Desactivar Cafeína.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_caffeine_on">Habilitar cafeína.</string>
+  <string name="accessibility_quick_settings_caffeine_on">Activar Cafeína.</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Apagar modo de ahorro de batería.</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/res/values-hr/cm_strings.xml b/packages/SystemUI/res/values-hr/cm_strings.xml
index 371f4db..921c9ed 100644
--- a/packages/SystemUI/res/values-hr/cm_strings.xml
+++ b/packages/SystemUI/res/values-hr/cm_strings.xml
@@ -27,19 +27,19 @@
          values/config.xml) and must be truncated.
          [CHAR LIMIT=4] -->
   <!-- Strings for lockscreen shortcut hints -->
-  <string name="left_shortcut_hint">Kliznite desno za %1$s</string>
-  <string name="right_shortcut_hint">Kliznite lijevo za %1$s</string>
+  <string name="left_shortcut_hint">Kliznite udesno za %1$s</string>
+  <string name="right_shortcut_hint">Kliznite ulijevo za %1$s</string>
   <string name="lockscreen_message">Dodirnite ikonu na lijevoj ili desnoj strani da biste postavili prečac zaključanog zaslona.</string>
   <string name="lockscreen_default_target">Zadano</string>
   <string name="select_application">Odaberite aplikaciju</string>
   <string name="lockscreen_choose_action_title">Odaberite radnju</string>
-  <string name="lockscreen_none_target">Nijedan</string>
+  <string name="lockscreen_none_target">Ništa</string>
   <!-- Dialog title for navigation bar button selection -->
-  <string name="navbar_dialog_title">Odaberi radnju</string>
+  <string name="navbar_dialog_title">Odaberite radnju</string>
   <string name="navbar_home_button">Gumb za početni zaslon</string>
-  <string name="navbar_recent_button">Tipka nedavno</string>
+  <string name="navbar_recent_button">Tipka za nedavne aplikacije</string>
   <string name="navbar_search_button">Tipka za pretraživanje</string>
-  <string name="navbar_back_button">Tipka nazad</string>
+  <string name="navbar_back_button">Tipka za povratak natrag</string>
   <string name="navbar_empty_button">Prazna tipka</string>
   <string name="navbar_menu_conditional_button">Tipka izbornika (automatsko sakrivanje)</string>
   <string name="navbar_menu_always_button">Tipka izbornika (uvijek prikaži)</string>
@@ -62,25 +62,25 @@
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profili su isključeni.</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_profiles_changed">Profil promijenjen u <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
+  <string name="accessibility_quick_settings_profiles_changed">Profil je promijenjen u <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicijalizacija\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Postavke svjetla</string>
-  <string name="led_notification_text">LED svjetlo omogućeno postavkama</string>
-  <string name="qs_tile_edit_header_instruction">Pritisnite i držite pločicu za uređivanje</string>
+  <string name="led_notification_text">LED svjetlo je omogućeno u postavkama</string>
+  <string name="qs_tile_edit_header_instruction">Pritisnite i držite pločice za uređivanje</string>
   <string name="quick_settings_edit_label">Uredi pločice</string>
-  <string name="quick_settings_cannot_delete_edit_tile">Nije moguće obrisati Uredi pločice</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Ne možete izbrisati pločicu za uređivanje</string>
   <string name="qs_tiles_reset_confirmation">Vratiti pločice brzih postavki na zadano?</string>
   <string name="quick_settings_tile_reset_to_default">Vraćanje na zadani izgled</string>
   <string name="quick_settings_title_header">Zaglavlje</string>
   <string name="quick_settings_title_tiles">Pločice</string>
   <string name="quick_settings_title_show_weather">Pokaži prognozu</string>
-  <string name="quick_settings_title_show_brightness_slider">Pokaži klizač osvjetljenja</string>
+  <string name="quick_settings_title_show_brightness_slider">Prikaži klizač osvjetljenja</string>
   <string name="quick_settings_title_enlarge_first_row">Povećaj prvi red</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
-  <string name="screen_pinning_description_no_navbar">Ovo drži u pogledu dok ne otkvačite. Dodirnite i držite gumb natrag da bi otkvačili.</string>
-  <string name="quick_settings_custom_tile_detail_title">Prilagodljive pločice</string>
-  <string name="quick_settings_remove">Uklanjanje pločice</string>
+  <string name="screen_pinning_description_no_navbar">Ovo drži zaslon u pogledu dok ga ne otkvačite. Dodirnite i držite gumb za povratak natrag da biste ga otkvačili.</string>
+  <string name="quick_settings_custom_tile_detail_title">Prilagođena pločica</string>
+  <string name="quick_settings_remove">Ukloni pločicu</string>
   <string name="quick_settings_network_adb_label">ADB preko mreže</string>
   <string name="quick_settings_compass_label">Kompas</string>
   <string name="quick_settings_nfc_label">NFC</string>
@@ -99,39 +99,39 @@
   <string name="accessibility_quick_settings_sync_changed_off">Sinkronizacija je isključena.</string>
   <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sinkronizacija je uključena.</string>
-  <string name="quick_settings_sync_label">Sinkroniziranje</string>
+  <string name="quick_settings_sync_label">Sinkronizacija</string>
   <string name="quick_settings_volume_panel_label">Zvučna ploča</string>
-  <string name="quick_settings_usb_tether_label">USB dijeljenje veze</string>
-  <string name="quick_settings_screen_timeout_detail_title">Vrijeme do gašenja zaslona</string>
+  <string name="quick_settings_usb_tether_label">Dijeljenje veze preko USB-a</string>
+  <string name="quick_settings_screen_timeout_detail_title">Vrijeme isteka zaslona</string>
   <string name="quick_settings_lockscreen_label">Zaključani zaslon</string>
-  <string name="quick_settings_ambient_display_label">Ambijentni zaslon</string>
+  <string name="quick_settings_ambient_display_label">Ambijentalni zaslon</string>
   <string name="quick_settings_lockscreen_label_enforced">Provođenje zaključavanja zaslona</string>
-  <string name="quick_settings_lockscreen_label_locked_by_profile">Onemogućeno od strane profila</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Onemogućeno zbog profila</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_screen_timeout">Isključivanje zaslona: <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
+  <string name="accessibility_quick_settings_screen_timeout">Istek zaslona: <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_screen_timeout_changed">Isključivanje zaslona promijenjeno u <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
+  <string name="accessibility_quick_settings_screen_timeout_changed">Istek zaslona promijenjen je u <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
   <string name="qs_tile_performance">Način rada baterije</string>
   <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Baterija: način uštede energije.</string>
   <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_bal">Baterija: uravnoteženo.</string>
+  <string name="accessibility_quick_settings_perf_profile_bal">Baterija: uravnoteženi način rada.</string>
   <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Baterija: performanse.</string>
   <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_bias_power">Baterija: učinkoviti način.</string>
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Baterija: način rada učinkovitosti.</string>
   <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_bias_perf">Baterija: brzo.</string>
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">Baterija: brzi način rada.</string>
   <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Rad baterije promijenjen u način uštede.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Način rada baterije promijenjen je na način uštede energije.</string>
   <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bal">Rad baterije promijenjen u uravnotežen način.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">Način rada baterije promijenjen je na uravnotežen način rada.</string>
   <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_perf">Rad baterije promijenjen u performanse.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">Način rada baterije promijenjen je na performanse.</string>
   <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Način baterije promijenjen u učinkoviti.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Način rada baterije promijenjen je u način rada učinkovitosti.</string>
   <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Način baterije promijenjen u brzi.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Način rada baterije promijenjen je brzi način rada.</string>
   <string name="quick_settings_performance_profile_detail_title">Način rada baterije</string>
   <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Zaključani zaslon isključen.</string>
@@ -142,17 +142,17 @@
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Zaključani zaslon je uključen.</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_ambient_display_off">Ambijentni zaslon isključen.</string>
+  <string name="accessibility_quick_settings_ambient_display_off">Ambijentalni zaslon isključen.</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_ambient_display_on">Ambijentni zaslon uključen.</string>
+  <string name="accessibility_quick_settings_ambient_display_on">Ambijentalni zaslon uključen.</string>
   <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_ambient_display_changed_off">Ambijentni zaslon je isključen.</string>
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Ambijentalni je zaslon isključen.</string>
   <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_ambient_display_changed_on">Ambijentni zaslon je uključen.</string>
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Ambijentalni je zaslon uključen.</string>
   <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_heads_up_off">Plutajuće su obavijesti isključene.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Plutajuće obavijesti isključene.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_heads_up_on">Plutajuće su obavijesti uključene.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Plutajuće obavijesti uključene.</string>
   <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Plutajuće su obavijesti isključene.</string>
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -172,16 +172,16 @@
   <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dinamične pločice</string>
   <string name="dynamic_qs_tile_next_alarm_label">Sljedeći alarm</string>
-  <string name="dynamic_qs_tile_ime_selector_label">IME za odabir</string>
+  <string name="dynamic_qs_tile_ime_selector_label">Odabir načina unosa</string>
   <string name="dynamic_qs_tile_su_label">Root pristup</string>
   <string name="dynamic_qs_tile_themes_label">Teme</string>
-  <string name="quick_settings_title_advanced_location">Način lokacije</string>
+  <string name="quick_settings_title_advanced_location">3 stanja lokacije</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_battery_saving">Prijavljivanje lokacije: štednja baterije.</string>
+  <string name="accessibility_quick_settings_location_battery_saving">Izvještavanje o lokaciji: način štednje baterije.</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_gps_only">Prijavljivanje lokacije: samo senzori.</string>
+  <string name="accessibility_quick_settings_location_gps_only">Izvještavanje o lokaciji: način samo sa senzorima.</string>
   <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_high_accuracy">Prijavljivanje lokacije: visoka preciznost.</string>
+  <string name="accessibility_quick_settings_location_high_accuracy">Izvještavanje o lokaciji: način visoke preciznosti.</string>
   <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Način rada lokacije</string>
   <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
@@ -191,16 +191,16 @@
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Visoka preciznost</string>
   <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_battery_saving">Prijavljivanje lokacije promijenjeno u način uštede baterije.</string>
+  <string name="accessibility_quick_settings_location_changed_battery_saving">Izvještavanje o lokaciji promijenjeno je na način štednje baterije.</string>
   <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_gps_only">Prijavljivanje lokacije promijenjeno u samo senzori.</string>
+  <string name="accessibility_quick_settings_location_changed_gps_only">Izvještavanje o lokaciji promijenjeno je na način samo sa senzorima.</string>
   <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">Prijavljivanje lokacije promijenjeno u način visoke preciznosti.</string>
-  <string name="quick_settings_tiles_category_system">Sistemske pločice</string>
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">Izvještavanje o lokaciji promijenjeno je na način visoke preciznosti.</string>
+  <string name="quick_settings_tiles_category_system">Pločice sustava</string>
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Dodaj pločicu</string>
   <!-- Hotspot dialog message -->
-  <string name="hotspot_apm_message">Nije moguće povezivanje s mobilnim mrežama dok je omogućen način rada u zrakoplovu. Onemogućite način rada u zrakoplovu i pokušajte ponovno.</string>
+  <string name="hotspot_apm_message">Nije moguće povezati se s mobilnim mrežama dok je uključen način rada u zrakoplovu. Onemogućite način rada u zrakoplovu i pokušajte ponovno.</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Svjetiljka je uključena</string>
   <string name="quick_settings_tile_flashlight_not_summary">Dodirnite za isključivanje</string>
@@ -213,15 +213,15 @@
   <!-- CellularTile data sim not configured state string -->
   <string name="data_sim_not_configured">Nema SIM podatkovne kartice</string>
   <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_dock_battery_level">Dock baterija <xliff:g id="number">%d</xliff:g> postotak.</string>
+  <string name="accessibility_dock_battery_level">Dock baterija <xliff:g id="number">%d</xliff:g> posto.</string>
   <!-- Play queue -->
-  <string name="play_queue_extention">Prikaži listu za reprodukciju</string>
+  <string name="play_queue_extention">Prikaži red za reprodukciju</string>
   <!-- Path data for portrait battery -->
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
   <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
   <string name="expand_hint">Prijeđite prstom prema dolje da biste proširili</string>
-  <string name="swipe_left_hint">Prijeđite prstom lijevo za <xliff:g id="app_name">%1$s</xliff:g></string>
-  <string name="swipe_right_hint">Prijeđite prstom desno za obavijesti</string>
+  <string name="swipe_left_hint">Prijeđite prstom ulijevo za <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Prijeđite prstom udesno za obavijesti</string>
 </resources>
diff --git a/packages/SystemUI/res/values-in/cm_strings.xml b/packages/SystemUI/res/values-in/cm_strings.xml
index 38880b4..6506019 100644
--- a/packages/SystemUI/res/values-in/cm_strings.xml
+++ b/packages/SystemUI/res/values-in/cm_strings.xml
@@ -29,7 +29,7 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Geser ke kanan untuk %1$s</string>
   <string name="right_shortcut_hint">Geser ke kiri untuk %1$s</string>
-  <string name="lockscreen_message">Ketuk ikon di sebelah kiri atau kanan untuk menugaskan kembali pintasan layar kunci.</string>
+  <string name="lockscreen_message">Ketuk ikon di sebelah kiri atau kanan untuk mengatur pintasan kunci layar.</string>
   <string name="lockscreen_default_target">Standar</string>
   <string name="select_application">Pilih aplikasi</string>
   <string name="lockscreen_choose_action_title">Pilih tindakan</string>
@@ -101,7 +101,7 @@
   <string name="accessibility_quick_settings_sync_changed_on">Sinkronisasi dihidupkan.</string>
   <string name="quick_settings_sync_label">Sinkronisasi</string>
   <string name="quick_settings_volume_panel_label">Panel volume</string>
-  <string name="quick_settings_usb_tether_label">Tethering USB</string>
+  <string name="quick_settings_usb_tether_label">Penambatan USB</string>
   <string name="quick_settings_screen_timeout_detail_title">Waktu layar mati</string>
   <string name="quick_settings_lockscreen_label">Kunci layar</string>
   <string name="quick_settings_ambient_display_label">Tampilan ambien</string>
@@ -111,13 +111,13 @@
   <string name="accessibility_quick_settings_screen_timeout">Batas waktu layar: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Batas waktu layar diubah menjadi <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
-  <string name="qs_tile_performance">Mode Baterai</string>
+  <string name="qs_tile_performance">Mode baterai</string>
   <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Mode baterai: hemat daya.</string>
   <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_bal">Mode Baterai: seimbang.</string>
+  <string name="accessibility_quick_settings_perf_profile_bal">Mode baterai: seimbang.</string>
   <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_perf">Mode Baterai: Performa.</string>
+  <string name="accessibility_quick_settings_perf_profile_perf">Mode baterai: Performa.</string>
   <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Mode baterai: efisien.</string>
   <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -132,7 +132,7 @@
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Mode baterai diubah menjadi mode efisien.</string>
   <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Mode baterai diubah menjadi mode cepat.</string>
-  <string name="quick_settings_performance_profile_detail_title">Mode Baterai</string>
+  <string name="quick_settings_performance_profile_detail_title">Mode baterai</string>
   <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Kunci layar mati.</string>
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Alarm selanjutnya</string>
   <string name="dynamic_qs_tile_ime_selector_label">Pemilih IME</string>
   <string name="dynamic_qs_tile_su_label">Akses root</string>
+  <string name="dynamic_qs_tile_themes_label">Tema</string>
   <string name="quick_settings_title_advanced_location">Lokasi Tri-state</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Laporan Lokasi: mode hemat baterai.</string>
diff --git a/packages/SystemUI/res/values-sr-rCS/cm_arrays.xml b/packages/SystemUI/res/values-sr-rCS/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-sr-rCS/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 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">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-sr-rCS/cm_strings.xml b/packages/SystemUI/res/values-sr-rCS/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-sr-rCS/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-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">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-sr-rCS/strings.xml b/packages/SystemUI/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-sr-rCS/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-uk/cm_strings.xml b/packages/SystemUI/res/values-uk/cm_strings.xml
index 57b9cb5..303691c 100644
--- a/packages/SystemUI/res/values-uk/cm_strings.xml
+++ b/packages/SystemUI/res/values-uk/cm_strings.xml
@@ -75,6 +75,7 @@
   <string name="quick_settings_title_header">Заголовок</string>
   <string name="quick_settings_title_tiles">Плитки</string>
   <string name="quick_settings_title_show_weather">Показати погоду</string>
+  <string name="quick_settings_title_show_brightness_slider">Показати повзунок яскравості</string>
   <string name="quick_settings_title_enlarge_first_row">Збільшити перший рядок</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Триматиме це перед Вами, доки не відкріпите. Торкніться й утримуйте кнопку «Назад», щоб відкріпити.</string>
@@ -88,6 +89,8 @@
   <string name="quick_settings_heads_up_label">Спливаючі сповіщення</string>
   <string name="quick_settings_battery_saver_label">Енергозбереження</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Енергозберігання (триває зарядка)</string>
+  <string name="quick_settings_caffeine_label">Кофеїн</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Синхронізацію вимкнено.</string>
   <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -103,6 +106,7 @@
   <string name="quick_settings_lockscreen_label">Заблокувати екран</string>
   <string name="quick_settings_ambient_display_label">Ambient display</string>
   <string name="quick_settings_lockscreen_label_enforced">Блокування екрану ввімкнено</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Вимкнено профілем</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Вимкнення екрана через: <xliff:g id="timeout" example="30 seconds">%s</xliff:g> секунд.</string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -154,7 +158,9 @@
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Спливаючі сповіщення увімкнено.</string>
   <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Кофеїн вимкнено.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Кофеїн увімкнено.</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Енергозбереження вимкнено.</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -168,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Наступний сигнал</string>
   <string name="dynamic_qs_tile_ime_selector_label">Вибір способу вводу</string>
   <string name="dynamic_qs_tile_su_label">Root доступ</string>
+  <string name="dynamic_qs_tile_themes_label">Теми</string>
   <string name="quick_settings_title_advanced_location">Параметри відправки геоданих</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Надсилання місця розташування: економія батареї.</string>
@@ -193,9 +200,18 @@
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Додати плитку</string>
   <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Неможливо під\'єднатися до мобільної мережі, доки увімкнуто режим польоту. Вимкніть цей режим та спробуйте ще раз.</string>
   <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Ліхтарик увімкнено</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Торкніться для вимкнення</string>
   <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d клієнт</item>
+    <item quantity="few">%1$d клієнти</item>
+    <item quantity="other">%1$d клієнтів</item>
+  </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Відсутня SIM для мобільних даних</string>
   <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_dock_battery_level">Заряд батареї док-станції <xliff:g id="number">%d</xliff:g> процентів.</string>
   <!-- Play queue -->
@@ -204,4 +220,8 @@
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Потягніть вниз, щоб розгорнути</string>
+  <string name="swipe_left_hint">Потягніть ліворуч, щоб перейти до <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Потягніть праворуч, щоб перейти до сповіщень</string>
 </resources>
diff --git a/packages/SystemUI/res/values-vi/cm_strings.xml b/packages/SystemUI/res/values-vi/cm_strings.xml
index e60cee2..62637d5 100644
--- a/packages/SystemUI/res/values-vi/cm_strings.xml
+++ b/packages/SystemUI/res/values-vi/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Báo thức tiếp theo</string>
   <string name="dynamic_qs_tile_ime_selector_label">Trình chọn IME</string>
   <string name="dynamic_qs_tile_su_label">Truy cập root</string>
+  <string name="dynamic_qs_tile_themes_label">Chủ đề</string>
   <string name="quick_settings_title_advanced_location">Ba trạng thái cho cài đặt vị trí</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Báo cáo vị trí: chế độ tiết kiệm pin.</string>
@@ -217,4 +218,8 @@
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Vuốt xuống để mở rộng</string>
+  <string name="swipe_left_hint">Vuốt sang trái để <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Vuốt sang trái để đến các thông báo</string>
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index 0a902a2..c47567a 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -172,7 +172,7 @@
   <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">動態圖塊</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
-  <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
+  <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇工具</string>
   <string name="dynamic_qs_tile_su_label">Root 權限</string>
   <string name="dynamic_qs_tile_themes_label">主題</string>
   <string name="quick_settings_title_advanced_location">三角定位</string>
diff --git a/packages/VpnDialogs/res/values-sr-rCS/strings.xml b/packages/VpnDialogs/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-sr-rCS/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-sr-rCS/strings.xml b/packages/WallpaperCropper/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-sr-rCS/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
-- 
cgit v1.1